<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/609a8262a3cc688b8e93e6b40a49fd799c30fc95">https://github.com/macports/macports-ports/commit/609a8262a3cc688b8e93e6b40a49fd799c30fc95</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 609a826 ntpsec: update to 1.1.2
</span>609a826 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 609a8262a3cc688b8e93e6b40a49fd799c30fc95
</span>Author: Fred Wright <fw@fwright.net>
AuthorDate: Wed Aug 29 15:15:48 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> ntpsec: update to 1.1.2
</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_2
</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 'ntptime' utility is currently not included prior to 10.13.
</span><span style='display:block; white-space:pre;color:#404040;'> Whether this is easily fixed is a matter for further study.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This now includes the -p option when generating the patchfile. This
</span><span style='display:block; white-space:pre;color:#404040;'> results in some additional "metadiffs" against the previous patchfile.
</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>---
sysutils/ntpsec/Portfile | 11 +-
sysutils/ntpsec/files/patch-PreHighSierra.diff | 170 ++++++++++++++-----------
2 files changed, 103 insertions(+), 78 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 dbfd2f7..59bca0a 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.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.1.2
</span> categories sysutils net
maintainers {lbschenkel @lbschenkel} {fwright.net:fw @fhgwright} \
openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,9 +19,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 6c11e9993f6f24402b8afd6021628f4bfd2627cc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 d06052b662ca3948841b7767a962cb8935c3da9deca7cabdba6b1bd689803262 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 2451415
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 b876eca0fca5cd92fd813fa9520f1c110e5df320 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 9dfaf1d791109160b3632a203bd75c784c54902442cea36983d5131b9f3b0111 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2458805
</span>
depends_build port:bison
depends_lib path:lib/libssl.dylib:openssl port:python${python.version}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,7 +38,8 @@ use_configure yes
</span> configure.args --alltests \
--define=CONFIG_FILE=${prefix}/etc/ntp.conf \
--disable-manpage \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --pythondir=${python.pkgd}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --pythondir=${python.pkgd} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --pythonarchdir=${python.pkgd}
</span> destroot.cmd ${build.cmd}
default_variants +doc
<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 2976d59..5446de8 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,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- attic/digest-timing.c.orig 2018-06-11 21:36:09.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ attic/digest-timing.c 2018-06-19 23:14:59.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -33,6 +33,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./attic/digest-timing.c.orig 2018-08-28 22:18:48.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./attic/digest-timing.c 2018-08-29 15:03:46.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -34,6 +34,8 @@
</span> #include <openssl/rand.h>
#include <openssl/objects.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@
</span> #define UNUSED_ARG(arg) ((void)(arg))
#ifndef EVP_MD_CTX_reset
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -43,6 +45,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -44,6 +46,23 @@
</span> #define EVP_MD_CTX_reset(ctx) EVP_MD_CTX_init(ctx)
#endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,7 +33,7 @@
</span>
/* Get timing for old slower way too. Pre Feb 2018 */
#define DoSLOW 1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -144,21 +163,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -146,21 +165,21 @@ static void DoDigest(
</span>
if (NULL == digest) return;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,7 +59,7 @@
</span> slow = (stop.tv_sec-start.tv_sec)*1E9 + (stop.tv_nsec-start.tv_nsec);
printf(" %6.0f %2.0f %4.0f",
slow/NUM, (slow-fast)*100.0/slow, (slow-fast)/NUM);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -183,11 +202,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -185,11 +204,11 @@ static void DoCMAC(
</span>
if (NULL == cipher) return;
<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-06-11 21:36:09.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/ntp_machine.h 2018-06-19 23:14:59.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./include/ntp_machine.h.orig 2018-08-28 22:18:48.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./include/ntp_machine.h 2018-08-29 15:03:46.000000000 -0700
</span> @@ -13,14 +13,53 @@
#ifndef CLOCK_REALTIME
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -134,9 +134,9 @@
</span>
int ntp_set_tod (struct timespec *tvs);
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- include/ntp_stdlib.h.orig 2018-06-11 21:36:09.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/ntp_stdlib.h 2018-06-19 23:14:59.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -113,7 +113,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./include/ntp_stdlib.h.orig 2018-08-28 22:18:48.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./include/ntp_stdlib.h 2018-08-29 15:03:46.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -98,7 +98,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;'>@@ -145,9 +145,9 @@
</span> +#endif
extern char * statustoa (int, int);
extern sockaddr_u * netof6 (sockaddr_u *);
<span style='display:block; white-space:pre;background:#ffe0e0;'>- extern char * numtoa (uint32_t);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- include/ntp_syscall.h.orig 2018-06-11 21:36:09.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/ntp_syscall.h 2018-06-19 23:14:59.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern const char * socktoa (const sockaddr_u *);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./include/ntp_syscall.h.orig 2018-08-28 22:18:48.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./include/ntp_syscall.h 2018-08-29 15:03:46.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-06-11 21:36:09.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libntp/clockwork.c 2018-06-19 23:14:59.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./libntp/clockwork.c.orig 2018-08-28 22:18:48.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./libntp/clockwork.c 2018-08-29 15:03:46.000000000 -0700
</span> @@ -5,8 +5,10 @@
#include "config.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -175,7 +175,7 @@
</span>
#include "ntp.h"
#include "ntp_machine.h"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -77,14 +79,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -77,14 +79,10 @@ ntp_set_tod(
</span> int saved_errno;
TPRINT(1, ("In ntp_set_tod\n"));
<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-06-11 21:36:09.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libntp/statestr.c 2018-06-19 23:14:59.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./libntp/statestr.c.orig 2018-08-28 22:18:48.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./libntp/statestr.c 2018-08-29 15:03:46.000000000 -0700
</span> @@ -12,7 +12,9 @@
#include "lib_strbuf.h"
#include "ntp_refclock.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -202,7 +202,7 @@
</span>
/*
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -186,23 +188,50 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -186,23 +188,50 @@ static const struct codestring res_acces
</span> /* not used with getcode(), no terminating entry needed */
};
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -253,7 +253,7 @@
</span> # ifdef STA_NANO
{ STA_NANO, "nano" },
# endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -214,6 +243,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -214,6 +243,7 @@ static const struct codestring k_st_bits
</span> # endif
/* not used with getcode(), no terminating entry needed */
};
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -261,10 +261,12 @@
</span>
/* Forwards */
static const char * getcode(int, const struct codestring *);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -315,9 +345,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -314,10 +344,12 @@ decode_bitflags(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "decode_bitflags(%s) can't decode 0x%x in %d bytes",
</span> (tab == peer_st_bits)
? "peer_st"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ :
</span> +#ifdef HAVE_KERNEL_PLL
(tab == k_st_bits)
? "kern_st"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -273,7 +275,7 @@
</span> "",
(unsigned)bits, (int)LIB_BUFLENGTH);
errno = saved_errno;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -356,6 +388,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -356,6 +388,7 @@ res_access_flags(
</span> }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -281,7 +283,7 @@
</span> const char *
k_st_flags(
uint32_t st
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -363,6 +396,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -363,6 +396,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;'>@@ -290,9 +292,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-06-11 21:36:09.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ntpd/ntp_control.c 2018-06-19 23:14:59.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1469,6 +1469,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./ntpd/ntp_control.c.orig 2018-08-28 22:18:48.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./ntpd/ntp_control.c 2018-08-29 15:03:46.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1464,6 +1464,7 @@ ctl_putsys(
</span> char str[256];
double dtemp;
const char *ss;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -300,7 +302,7 @@
</span> static struct timex ntx;
static unsigned long ntp_adjtime_time;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1483,6 +1484,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1478,6 +1479,7 @@ ctl_putsys(
</span> else
ntp_adjtime_time = current_time;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -308,7 +310,7 @@
</span>
switch (varid) {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1856,50 +1858,93 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1866,50 +1868,93 @@ ctl_putsys(
</span> break;
/*
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -414,8 +416,8 @@
</span> break;
case CS_K_PPS_FREQ:
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- ntpd/ntp_loopfilter.c.orig 2018-06-11 21:36:09.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ntpd/ntp_loopfilter.c 2018-06-19 23:14:59.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./ntpd/ntp_loopfilter.c.orig 2018-08-28 22:18:48.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./ntpd/ntp_loopfilter.c 2018-08-29 15:03:46.000000000 -0700
</span> @@ -23,8 +23,10 @@
#define NTP_MAXFREQ 500e-6
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -427,7 +429,7 @@
</span>
/*
* This is an implementation of the clock discipline algorithm described
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -122,13 +124,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -122,13 +124,16 @@ double drift_comp; /* frequency (s/s) *
</span> static double init_drift_comp; /* initial frequency (PPM) */
double clock_stability; /* frequency stability (wander) (s/s) */
unsigned int sys_tai; /* TAI offset from UTC */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -445,7 +447,7 @@
</span> #ifndef PATH_MAX
# define PATH_MAX MAX_PATH
#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -144,6 +149,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -144,6 +149,7 @@ static unsigned int loop_tai; /* last T
</span> #endif /* ENABLE_LOCKCLOCK */
static void start_kern_loop(void);
static void stop_kern_loop(void);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -453,7 +455,7 @@
</span>
/*
* Clock state machine control flags
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -160,7 +166,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -160,7 +166,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;'>@@ -463,7 +465,7 @@
</span>
/*
* Clock state machine variables
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -180,6 +188,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -180,6 +188,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;'>@@ -471,7 +473,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;'>-@@ -189,7 +198,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -189,7 +198,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;'>@@ -481,7 +483,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;'>-@@ -215,6 +226,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -215,6 +226,7 @@ static char *file_name(void)
</span> }
return this_file;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -489,7 +491,7 @@
</span>
/*
* init_loopfilter - initialize loop filter data
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -230,6 +242,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -230,6 +242,7 @@ init_loopfilter(void)
</span> freq_cnt = (int)clock_minstep;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -497,7 +499,7 @@
</span> /*
* ntp_adjtime_error_handler - process errors from ntp_adjtime
*/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -428,6 +441,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -428,6 +441,7 @@ or, from ntp_adjtime():
</span> }
return;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -505,7 +507,7 @@
</span>
/*
* local_clock - the NTP logical clock loop filter.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -453,7 +467,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -453,7 +467,9 @@ local_clock(
</span> #else
int rval; /* return code */
int osys_poll; /* old system poll */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -515,7 +517,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;'>-@@ -722,6 +738,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -722,6 +738,7 @@ local_clock(
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -523,7 +525,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;'>-@@ -837,6 +854,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -837,6 +854,7 @@ local_clock(
</span> }
#endif /* STA_NANO */
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -531,7 +533,7 @@
</span>
/*
* Clamp the frequency within the tolerance range and calculate
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -950,8 +968,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -950,8 +968,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;'>@@ -542,7 +544,7 @@
</span> } else {
offset_adj = clock_offset / (CLOCK_PLL * ULOGTOD(sys_poll));
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -962,9 +982,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -962,9 +982,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;'>@@ -554,7 +556,7 @@
</span> freq_adj = drift_comp;
/* Bound absolute value of total adjustment to NTP_MAXFREQ. */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1056,6 +1078,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1056,6 +1078,7 @@ set_freq(
</span>
drift_comp = freq;
loop_desc = "ntpd";
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -562,7 +564,7 @@
</span> if (clock_ctl.pll_control) {
int ntp_adj_ret;
ZERO(ntv);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1068,11 +1091,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1068,11 +1091,13 @@ 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;'>@@ -576,7 +578,7 @@
</span> static void
start_kern_loop(void)
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1133,8 +1158,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1133,8 +1158,10 @@ start_kern_loop(void)
</span> "kernel time sync enabled");
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -587,7 +589,7 @@
</span> static void
stop_kern_loop(void)
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1142,6 +1169,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1142,6 +1169,7 @@ stop_kern_loop(void)
</span> report_event(EVNT_KERN, NULL,
"kernel time sync disabled");
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -595,7 +597,7 @@
</span>
/*
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1154,17 +1182,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1154,17 +1182,21 @@ select_loop(
</span> {
if (clock_ctl.kern_enable == use_kern_loop)
return;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -618,7 +620,7 @@
</span> if (clock_ctl.pll_control && loop_started)
set_freq(drift_comp);
#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1215,10 +1247,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1215,10 +1247,12 @@ loop_config(
</span> */
case LOOP_DRIFTINIT:
#ifndef ENABLE_LOCKCLOCK
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -631,7 +633,7 @@
</span>
/*
* Initialize frequency if given; otherwise, begin frequency
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1236,13 +1270,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1236,13 +1270,16 @@ loop_config(
</span> rstclock(EVNT_FSET, 0);
else
rstclock(EVNT_NSET, 0);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -648,7 +650,7 @@
</span> if (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;'>-@@ -1252,6 +1289,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1252,6 +1289,7 @@ loop_config(
</span> pll_status,
ntv.status);
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -656,7 +658,7 @@
</span> #endif /* ENABLE_LOCKCLOCK */
#endif
break;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1331,7 +1369,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1331,7 +1369,7 @@ loop_config(
</span> }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -665,14 +667,14 @@
</span> /*
* _trap - trap processor for undefined syscalls
*
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1349,4 +1387,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1349,4 +1387,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 2018-06-11 21:36:09.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ntpd/ntp_timer.c 2018-06-19 23:14:59.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./ntpd/ntp_timer.c.orig 2018-08-28 22:18:48.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./ntpd/ntp_timer.c 2018-08-29 15:03:46.000000000 -0700
</span> @@ -13,7 +13,9 @@
#include <signal.h>
#include <unistd.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -683,7 +685,7 @@
</span>
#ifdef HAVE_TIMER_CREATE
/* TC_ERR represents the timer_create() error return value. */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -373,7 +375,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -373,7 +375,11 @@ check_leapsec(
</span>
leap_result_t lsdata;
uint32_t lsprox;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -695,9 +697,9 @@
</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 2018-06-11 21:36:09.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ntpd/refclock_local.c 2018-06-19 23:14:59.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -131,6 +131,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./ntpd/refclock_local.c.orig 2018-08-28 22:18:48.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./ntpd/refclock_local.c 2018-08-29 15:03:46.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -131,6 +131,9 @@ local_poll(
</span> struct peer *peer
)
{
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -707,7 +709,7 @@
</span> struct refclockproc *pp;
UNUSED_ARG(unit);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -156,8 +159,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -156,8 +159,7 @@ local_poll(
</span> * 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;'>@@ -717,7 +719,7 @@
</span> memset(&ntv, 0, sizeof ntv);
switch (ntp_adjtime(&ntv)) {
case TIME_OK:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -181,11 +183,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -181,11 +183,11 @@ local_poll(
</span> }
pp->disp = 0;
pp->jitter = 0;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -731,8 +733,8 @@
</span> pp->lastref = pp->lastrec;
refclock_receive(peer);
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- ntpfrob/precision.c.orig 2018-06-11 21:36:09.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ntpfrob/precision.c 2018-06-19 23:14:59.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./ntpfrob/precision.c.orig 2018-08-28 22:18:48.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./ntpfrob/precision.c 2018-08-29 15:03:46.000000000 -0700
</span> @@ -11,6 +11,7 @@
#include "ntp_types.h"
#include "ntp_calendar.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -741,9 +743,31 @@
</span>
#define DEFAULT_SYS_PRECISION -99
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- wafhelpers/options.py.orig 2018-06-11 21:36:09.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ wafhelpers/options.py 2018-06-19 23:14:59.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -21,6 +21,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./tests/libntp/statestr.c.orig 2018-08-28 22:18:48.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./tests/libntp/statestr.c 2018-08-29 15:03:46.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4,7 +4,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "unity.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "unity_fixture.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef HAVE_SYS_TIMEX_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/timex.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;'>+ TEST_GROUP(statestr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -29,7 +31,9 @@ TEST(statestr, ResAccessFlags) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // k_st_flags()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TEST(statestr, KSTFlags) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef STA_PPSFREQ
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TEST_ASSERT_EQUAL_STRING("ppsfreq", k_st_flags(STA_PPSFREQ));
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // statustoa
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./wafhelpers/options.py.orig 2018-08-28 22:18:48.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./wafhelpers/options.py 2018-08-29 15:03:46.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -21,6 +21,8 @@ def options_cmd(ctx, config):
</span> default=False, help="Enable seccomp (restricts syscalls).")
grp.add_option('--disable-dns-lookup', action='store_true',
default=False, help="Disable DNS lookups.")
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -752,9 +776,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-06-11 21:36:09.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ wscript 2018-06-19 23:14:59.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -562,13 +562,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./wscript.orig 2018-08-28 22:18:48.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./wscript 2018-08-29 15:03:46.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -562,13 +562,13 @@ int main(int argc, char **argv) {
</span> ctx.define("__EXTENSIONS__", "1", quote=False)
structures = (
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -774,7 +798,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;'>-@@ -625,8 +625,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -626,8 +626,6 @@ int main(int argc, char **argv) {
</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;'>@@ -783,7 +807,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;'>-@@ -771,6 +769,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -772,6 +770,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>