<pre style='margin:0'>
Clemens Lang (neverpanic) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/7e2fe8d962042218aff4ace9f4961249c5458025">https://github.com/macports/macports-ports/commit/7e2fe8d962042218aff4ace9f4961249c5458025</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 7e2fe8d ntpsec: update to 1.1.7
</span>7e2fe8d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7e2fe8d962042218aff4ace9f4961249c5458025
</span>Author: Fred Wright <fw@fwright.net>
AuthorDate: Fri Sep 6 22:20:40 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> ntpsec: update to 1.1.7
</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_1_7
</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, MacPro 10.14, MacBookPro 10.9,
</span><span style='display:block; white-space:pre;color:#404040;'> PowerBook 10.5, and VMs for 10.5-10.13. Built with default
</span><span style='display:block; white-space:pre;color:#404040;'> variants, all single non-default variants, and all non-default
</span><span style='display:block; white-space:pre;color:#404040;'> variants.
</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;'> Does not address ticket 57272 (s/b low priority).
</span>---
sysutils/ntpsec/Portfile | 9 +-
sysutils/ntpsec/files/patch-PreHighSierra.diff | 160 +++++++++++++------------
2 files changed, 89 insertions(+), 80 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 2b2003d..1314401 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.6
</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.7
</span> categories sysutils net
maintainers {fwright.net:fw @fhgwright} openmaintainer
description A secure, hardened, and improved implementation of NTP
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,9 +18,9 @@ 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 b539282b5d15c7541994c65ef24af1d890b25f9f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 8d7c4e41206f7e23727b8b76e06ea0d7d5b13f0afe6ac4c52181c8522e38f79c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 2600632
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 4f88807fc4652d2bb0608ca82df5b7e6be18eb63 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 48eb3e0ed932fccc21373bc34a344b0c7164fda637f9b822b85b146f1aea398b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2534524
</span>
depends_build port:bison
depends_lib path:lib/libssl.dylib:openssl port:python${python.version}
<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 3230733..776855b 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 2019-06-21 19:41:51.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./attic/backwards.c 2019-07-11 17:54:24.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./attic/backwards.c.orig 2019-09-02 19:17:36.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./attic/backwards.c 2019-09-03 22:22:14.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 2019-06-21 19:41:51.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./attic/clocks.c 2019-07-11 17:54:24.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./attic/clocks.c.orig 2019-09-02 19:17:36.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./attic/clocks.c 2019-09-03 22:22:14.000000000 -0700
</span> @@ -5,6 +5,8 @@
#include <stdio.h>
#include <time.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,8 +20,8 @@
</span> struct table {
const int type;
const char* name;
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./attic/digest-timing.c.orig 2019-06-21 19:41:51.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./attic/digest-timing.c 2019-07-11 17:54:24.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./attic/digest-timing.c.orig 2019-09-02 19:17:36.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./attic/digest-timing.c 2019-09-03 22:22:14.000000000 -0700
</span> @@ -34,6 +34,8 @@
#include <openssl/rand.h>
#include <openssl/objects.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,9 +31,9 @@
</span> #define UNUSED_ARG(arg) ((void)(arg))
#ifndef EVP_MD_CTX_reset
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./include/ntp_machine.h.orig 2019-06-21 19:41:51.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./include/ntp_machine.h 2019-07-11 17:54:24.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -13,14 +13,135 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./include/ntp_machine.h.orig 2019-09-02 19:17:36.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./include/ntp_machine.h 2019-09-03 22:22:14.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -13,14 +13,145 @@
</span>
#ifndef CLOCK_REALTIME
/*
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -152,6 +152,16 @@
</span> + }
+}
+
<span style='display:block; white-space:pre;background:#e0ffe0;'>++/*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * Prototype for settimeofday() may suppressed by feature-test flags.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * Provide it here just in case, and get an error if it mismatches.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * Similarly, "struct timezone" definition may be suppressed, but the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * incomplete definition provided here is adequate given that the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * timezone argument is unused.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++struct timezone;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int settimeofday(const struct timeval *, const struct timezone *);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span> +static inline int clock_settime(clockid_t clk_id, const struct timespec *tp)
+{
+ switch (clk_id) {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -175,9 +185,9 @@
</span>
int ntp_set_tod (struct timespec *tvs);
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./include/ntp_stdlib.h.orig 2019-06-21 19:41:51.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./include/ntp_stdlib.h 2019-07-11 17:54:24.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -95,7 +95,9 @@ extern const char * eventstr (int);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./include/ntp_stdlib.h.orig 2019-09-02 19:17:36.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./include/ntp_stdlib.h 2019-09-03 22:22:14.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -96,7 +96,9 @@ extern const char * eventstr (int);
</span> extern const char * ceventstr (int);
extern const char * res_match_flags(unsigned short);
extern const char * res_access_flags(unsigned short);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -187,8 +197,8 @@
</span> extern char * statustoa (int, int);
extern sockaddr_u * netof6 (sockaddr_u *);
extern const char * socktoa (const sockaddr_u *);
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./include/ntp_syscall.h.orig 2019-06-21 19:41:51.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./include/ntp_syscall.h 2019-07-11 17:54:24.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./include/ntp_syscall.h.orig 2019-09-02 19:17:36.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./include/ntp_syscall.h 2019-09-03 22:22:14.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;'>@@ -201,8 +211,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 2019-06-21 19:41:51.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./libntp/clockwork.c 2019-07-11 17:54:24.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./libntp/clockwork.c.orig 2019-09-02 19:17:36.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./libntp/clockwork.c 2019-09-03 22:22:14.000000000 -0700
</span> @@ -5,8 +5,10 @@
#include "config.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -216,8 +226,8 @@
</span>
#include "ntp.h"
#include "ntp_machine.h"
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./libntp/statestr.c.orig 2019-06-21 19:41:51.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./libntp/statestr.c 2019-07-11 17:54:24.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./libntp/statestr.c.orig 2019-09-02 19:17:36.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./libntp/statestr.c 2019-09-03 22:22:14.000000000 -0700
</span> @@ -12,7 +12,9 @@
#include "lib_strbuf.h"
#include "ntp_refclock.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -287,7 +297,7 @@
</span>
/* Forwards */
static const char * getcode(int, const struct codestring *);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -314,10 +344,12 @@ decode_bitflags(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -318,10 +348,12 @@ decode_bitflags(
</span> "decode_bitflags(%s) can't decode 0x%x in %d bytes",
(tab == peer_st_bits)
? "peer_st"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -301,7 +311,7 @@
</span> "",
(unsigned)bits, (int)LIB_BUFLENGTH);
errno = saved_errno;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -356,6 +388,7 @@ res_access_flags(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -360,6 +392,7 @@ res_access_flags(
</span> }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -309,7 +319,7 @@
</span> const char *
k_st_flags(
uint32_t st
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -363,6 +396,8 @@ k_st_flags(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -367,6 +400,8 @@ k_st_flags(
</span> {
return decode_bitflags((int)st, " ", k_st_bits, COUNTOF(k_st_bits));
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -318,9 +328,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 2019-06-30 00:21:32.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./ntpd/ntp_control.c 2019-07-11 17:54:24.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1357,6 +1357,7 @@ ctl_putsys(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./ntpd/ntp_control.c.orig 2019-09-02 19:17:36.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./ntpd/ntp_control.c 2019-09-03 22:22:14.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1359,6 +1359,7 @@ ctl_putsys(
</span> char str[256];
double dtemp;
const char *ss;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -328,7 +338,7 @@
</span> static struct timex ntx;
static unsigned long ntp_adjtime_time;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1372,6 +1373,7 @@ ctl_putsys(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1374,6 +1375,7 @@ ctl_putsys(
</span> else
ntp_adjtime_time = current_time;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -336,7 +346,7 @@
</span>
switch (varid) {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1767,50 +1769,93 @@ ctl_putsys(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1769,50 +1771,93 @@ ctl_putsys(
</span> break;
/*
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -442,8 +452,8 @@
</span> break;
case CS_K_PPS_FREQ:
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./ntpd/ntp_loopfilter.c.orig 2019-06-21 19:41:51.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./ntpd/ntp_loopfilter.c 2019-07-11 17:54:24.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./ntpd/ntp_loopfilter.c.orig 2019-09-02 19:17:36.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./ntpd/ntp_loopfilter.c 2019-09-03 22:22:14.000000000 -0700
</span> @@ -23,8 +23,10 @@
#define NTP_MAXFREQ 500e-6
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -455,7 +465,7 @@
</span>
/*
* This is an implementation of the clock discipline algorithm described
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -127,6 +129,7 @@ static void rstclock (int, double); /* t
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -125,6 +127,7 @@ static void rstclock (int, double); /* t
</span> static double direct_freq(double); /* direct set frequency */
static void set_freq(double); /* set frequency */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -463,7 +473,7 @@
</span> #ifndef PATH_MAX
# define PATH_MAX MAX_PATH
#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -140,6 +143,7 @@ static unsigned int loop_tai; /* last TA
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -138,6 +141,7 @@ static unsigned int loop_tai; /* last TA
</span> #endif /* STA_NANO */
static void start_kern_loop(void);
static void stop_kern_loop(void);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -471,7 +481,7 @@
</span>
/*
* Clock state machine control flags
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -156,7 +160,9 @@ struct clock_control_flags clock_ctl = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -154,7 +158,9 @@ struct clock_control_flags clock_ctl = {
</span> int freq_cnt; /* initial frequency clamp */
static int freq_set; /* initial set frequency switch */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -481,7 +491,7 @@
</span>
/*
* Clock state machine variables
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -174,6 +180,7 @@ static int sys_hufflen; /* huff-n'-puff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -172,6 +178,7 @@ 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;'>@@ -489,7 +499,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;'>-@@ -183,7 +190,9 @@ static struct sigaction sigsys; /* curre
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -181,7 +188,9 @@ static struct sigaction sigsys; /* curre
</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;'>@@ -497,9 +507,9 @@
</span>
+#ifdef HAVE_KERNEL_PLL
static void
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sync_status(const char *what, int ostatus, int nstatus)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -208,6 +217,7 @@ static char *file_name(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sync_status(const char *what, int ostatus, int nstatus) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* only used in non-lockclock case */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -205,6 +214,7 @@ static char *file_name(void) {
</span> }
return this_file;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -507,7 +517,7 @@
</span>
/*
* init_loopfilter - initialize loop filter data
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -223,6 +233,7 @@ init_loopfilter(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -219,6 +229,7 @@ init_loopfilter(void) {
</span> freq_cnt = (int)clock_minstep;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -515,7 +525,7 @@
</span> /*
* ntp_adjtime_error_handler - process errors from ntp_adjtime
*/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -421,6 +432,7 @@ or, from ntp_adjtime():
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -417,6 +428,7 @@ or, from ntp_adjtime():
</span> }
return;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -523,7 +533,7 @@
</span>
/*
* local_clock - the NTP logical clock loop filter.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -453,7 +465,9 @@ local_clock(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -450,7 +462,9 @@ local_clock(
</span>
int rval; /* return code */
int osys_poll; /* old system poll */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -533,7 +543,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;'>-@@ -705,6 +719,7 @@ local_clock(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -707,6 +721,7 @@ local_clock(
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -541,7 +551,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;'>-@@ -820,6 +835,7 @@ local_clock(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -823,6 +838,7 @@ local_clock(
</span> }
#endif /* STA_NANO */
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -549,7 +559,7 @@
</span>
/*
* Clamp the frequency within the tolerance range and calculate
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -929,8 +945,10 @@ adj_host_clock(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -934,8 +950,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;'>@@ -558,9 +568,9 @@
</span> offset_adj = 0.;
+#endif /* HAVE_KERNEL_PLL */
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- offset_adj = clock_offset / (CLOCK_PLL * ULOGTOD(sys_poll));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ offset_adj = clock_offset / (CLOCK_PLL * ULOGTOD(clkstate.sys_poll));
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -941,9 +959,11 @@ adj_host_clock(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -946,9 +964,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;'>@@ -569,31 +579,31 @@
</span> freq_adj = 0.;
else
+#endif /* HAVE_KERNEL_PLL */
<span style='display:block; white-space:pre;background:#ffe0e0;'>- freq_adj = drift_comp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ freq_adj = loop_data.drift_comp;
</span>
/* Bound absolute value of total adjustment to NTP_MAXFREQ. */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1031,6 +1051,7 @@ set_freq(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1037,6 +1057,7 @@ set_freq(
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- drift_comp = freq;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ loop_data.drift_comp = freq;
</span> loop_desc = "ntpd";
+#ifdef HAVE_KERNEL_PLL
if (clock_ctl.pll_control) {
int ntp_adj_ret;
ZERO(ntv);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1043,10 +1064,12 @@ set_freq(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1049,10 +1070,12 @@ set_freq(
</span> ntp_adjtime_error_handler(__func__, &ntv, ntp_adj_ret, errno, false, false, __LINE__ - 1);
}
}
+#endif /* HAVE_KERNEL_PLL */
mprintf_event(EVNT_FSET, NULL, "%s %.6f PPM", loop_desc,
<span style='display:block; white-space:pre;background:#ffe0e0;'>- drift_comp * US_PER_S);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ loop_data.drift_comp * US_PER_S);
</span> }
+#ifdef HAVE_KERNEL_PLL
static void
start_kern_loop(void)
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1107,8 +1130,10 @@ start_kern_loop(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1113,8 +1136,10 @@ start_kern_loop(void)
</span> "kernel time sync enabled");
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -604,7 +614,7 @@
</span> static void
stop_kern_loop(void)
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1116,6 +1141,7 @@ stop_kern_loop(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1122,6 +1147,7 @@ stop_kern_loop(void)
</span> report_event(EVNT_KERN, NULL,
"kernel time sync disabled");
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -612,7 +622,7 @@
</span>
/*
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1128,11 +1154,15 @@ select_loop(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1134,11 +1160,15 @@ select_loop(
</span> {
if (clock_ctl.kern_enable == use_kern_loop)
return;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -628,12 +638,12 @@
</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;'>-@@ -1186,10 +1216,12 @@ loop_config(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1194,10 +1224,12 @@ loop_config(
</span> * variables. Otherwise, continue leaving no harm behind.
*/
case LOOP_DRIFTINIT:
+#ifdef HAVE_KERNEL_PLL
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if (lockclock || clock_ctl.mode_ntpdate)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (loop_data.lockclock || clock_ctl.mode_ntpdate)
</span> break;
start_kern_loop();
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -641,7 +651,7 @@
</span>
/*
* Initialize frequency if given; otherwise, begin frequency
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1207,11 +1239,14 @@ loop_config(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1216,11 +1248,14 @@ loop_config(
</span> rstclock(EVNT_FSET, 0);
else
rstclock(EVNT_NSET, 0);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -653,10 +663,10 @@
</span> case LOOP_KERN_CLEAR:
#if 0 /* XXX: needs more review, and how can we get here? */
+# ifdef HAVE_KERNEL_PLL
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!lockclock && (clock_ctl.pll_control && clock_ctl.kern_enable)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!loop_data.lockclock && (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;'>-@@ -1221,6 +1256,7 @@ loop_config(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1230,6 +1265,7 @@ loop_config(
</span> pll_status,
ntv.status);
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -664,7 +674,7 @@
</span> #endif
break;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1299,7 +1335,7 @@ loop_config(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1310,7 +1346,7 @@ loop_config(
</span> }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -673,14 +683,14 @@
</span> /*
* _trap - trap processor for undefined syscalls
*
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1317,4 +1353,4 @@ pll_trap(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1328,4 +1364,4 @@ pll_trap(
</span> clock_ctl.pll_control = false;
siglongjmp(env, 1);
}
-#endif /* SIGSYS */
+#endif /* HAVE_KERNEL_PLL && SIGSYS */
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./ntpd/ntp_timer.c.orig 2019-06-21 19:41:51.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./ntpd/ntp_timer.c 2019-07-11 17:54:24.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./ntpd/ntp_timer.c.orig 2019-09-02 19:17:36.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./ntpd/ntp_timer.c 2019-09-03 22:22:14.000000000 -0700
</span> @@ -13,7 +13,9 @@
#include <signal.h>
#include <unistd.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -703,14 +713,14 @@
</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 2019-06-21 19:41:51.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./ntpd/refclock_local.c 2019-07-11 17:54:24.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./ntpd/refclock_local.c.orig 2019-09-02 19:17:36.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./ntpd/refclock_local.c 2019-09-03 22:22:14.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.
*/
+#ifdef HAVE_KERNEL_PLL
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if (lockclock) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (loop_data.lockclock) {
</span> struct timex ntv;
memset(&ntv, 0, sizeof ntv);
@@ -188,6 +189,13 @@ local_poll(
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -727,8 +737,8 @@
</span> pp->lastref = pp->lastrec;
refclock_receive(peer);
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./ntpfrob/precision.c.orig 2019-06-21 19:41:51.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./ntpfrob/precision.c 2019-07-11 17:54:24.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./ntpfrob/precision.c.orig 2019-09-02 19:17:36.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./ntpfrob/precision.c 2019-09-03 22:22:14.000000000 -0700
</span> @@ -11,6 +11,7 @@
#include "ntp_types.h"
#include "ntp_calendar.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -737,8 +747,8 @@
</span>
#define DEFAULT_SYS_PRECISION -99
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./tests/libntp/statestr.c.orig 2019-06-21 19:41:51.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./tests/libntp/statestr.c 2019-07-11 17:54:24.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./tests/libntp/statestr.c.orig 2019-09-02 19:17:36.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./tests/libntp/statestr.c 2019-09-03 22:22:14.000000000 -0700
</span> @@ -4,7 +4,9 @@
#include "unity.h"
#include "unity_fixture.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -759,8 +769,8 @@
</span> }
// statustoa
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./wafhelpers/bin_test.py.orig 2019-06-21 19:41:51.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./wafhelpers/bin_test.py 2019-07-11 17:54:24.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./wafhelpers/bin_test.py.orig 2019-09-02 19:17:36.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./wafhelpers/bin_test.py 2019-09-03 22:22:14.000000000 -0700
</span> @@ -91,6 +91,12 @@ def cmd_bin_test(ctx, config):
for cmd in cmd_map3:
cmd_map2[cmd] = cmd_map3[cmd]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -774,8 +784,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 2019-06-21 19:41:51.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./wafhelpers/options.py 2019-07-11 17:54:24.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./wafhelpers/options.py.orig 2019-09-02 19:17:36.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./wafhelpers/options.py 2019-09-03 22:22:14.000000000 -0700
</span> @@ -19,6 +19,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;'>@@ -785,8 +795,8 @@
</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 2019-06-21 19:41:51.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./wscript 2019-07-11 17:54:24.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./wscript.orig 2019-09-02 19:17:36.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./wscript 2019-09-03 22:22:14.000000000 -0700
</span> @@ -593,7 +593,7 @@ int main(int argc, char **argv) {
structures = (
("struct if_laddrconf", ["sys/types.h", "net/if6.h"], False),
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -796,7 +806,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;'>-@@ -795,6 +795,21 @@ int main(int argc, char **argv) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -798,6 +798,21 @@ int main(int argc, char **argv) {
</span> ctx.define("HAVE_WORKING_FORK", 1,
comment="Whether a working fork() exists")
</pre><pre style='margin:0'>
</pre>