<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f16e754baaf2eae3fb5aeb8955d28c3da64f7dbd">https://github.com/macports/macports-ports/commit/f16e754baaf2eae3fb5aeb8955d28c3da64f7dbd</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 f16e754baaf ntpsec: update to 1.2.1
</span>f16e754baaf is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f16e754baaf2eae3fb5aeb8955d28c3da64f7dbd
</span>Author: Fred Wright <fw@fwright.net>
AuthorDate: Tue Aug 31 14:00:12 2021 -0700
<span style='display:block; white-space:pre;color:#404040;'> ntpsec: update to 1.2.1
</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_1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Up until recently, 10.5 x86_64 wasn't possible due to broken
</span><span style='display:block; white-space:pre;color:#404040;'> dependencies. That case now builds and passes its tests, but doesn't
</span><span style='display:block; white-space:pre;color:#404040;'> actually work. Pending resolution of this issue, x86_64 is excluded
</span><span style='display:block; white-space:pre;color:#404040;'> from supported_archs for 10.5, as well as for 10.4 since it might have
</span><span style='display:block; white-space:pre;color:#404040;'> the same issue and hasn't been tested. At present (on 10.5 x86_64),
</span><span style='display:block; white-space:pre;color:#404040;'> this results in at least one broken universal dependency, so it's back
</span><span style='display:block; white-space:pre;color:#404040;'> to not being buildable at all. This is no worse than previous
</span><span style='display:block; white-space:pre;color:#404040;'> versions.
</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 | 18 +++-
sysutils/ntpsec/files/patch-PreHighSierra.diff | 123 +++++++++++++------------
2 files changed, 76 insertions(+), 65 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 93d186cd48e..adc40aa3a47 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.2.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.2.1
</span> revision 0
categories sysutils net
maintainers {fwright.net:fw @fhgwright} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,9 +19,19 @@ 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 c9b30c514feca77d9c65ea7bea9f0e22ca80a767 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 6a7c7561a750519fe3441cbbaf1f684b379b97b655da4bf9cf0dd2052a4a02c8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 2625968
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 ca5d758bf6572b460ba8e8c8e70f09b8a7417fd0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 f2684835116c80b8f21782a5959a805ba3c44e3a681dd6c17c7cb00cc242c27a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2681237
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# 10.5 x86_64 builds successfully and passes all build tests, but doesn't
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# actually work. This has apparently been true forever, but until recently,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# dependency issues prevented building it at all. Since this is a rare case
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# and not really a regression, we simply disallow it for now. It's unknown
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# whether 10.4 x86_64 has the same issue, but we also disallow that out of
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# conservatism. This should be removed once the code is fixed.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${os.platform} eq "darwin" && ${os.major} < 10 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ supported_archs i386 ppc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</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
<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 583db74dbba..c56672cd4a5 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-10-05 21:16:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./attic/backwards.c 2020-10-08 17:43:39.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./attic/backwards.c.orig 2021-06-06 21:03:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./attic/backwards.c 2021-07-28 18:53:02.000000000 -0700
</span> @@ -7,6 +7,8 @@
#include <stdlib.h>
#include <time.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,19 +9,19 @@
</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-10-05 21:16:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./attic/clocks.c 2020-10-08 17:43:39.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5,6 +5,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <time.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./attic/clocks.c.orig 2021-06-06 21:03:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./attic/clocks.c 2021-07-28 18:53:02.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -9,6 +9,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <unistd.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>
+#include "ntp_machine.h" /* For clock_gettime fallback */
+
struct table {
const int type;
const char* name;
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./attic/cmac-timing.c.orig 2020-10-05 21:16:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./attic/cmac-timing.c 2020-10-08 17:43:39.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./attic/cmac-timing.c.orig 2021-06-06 21:03:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./attic/cmac-timing.c 2021-07-28 18:53:02.000000000 -0700
</span> @@ -35,6 +35,8 @@
#include <openssl/params.h>
#endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,8 +31,8 @@
</span> #define UNUSED_ARG(arg) ((void)(arg))
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./attic/digest-timing.c.orig 2020-10-05 21:16:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./attic/digest-timing.c 2020-10-08 17:43:39.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./attic/digest-timing.c.orig 2021-06-06 21:03:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./attic/digest-timing.c 2021-07-28 18:53:02.000000000 -0700
</span> @@ -33,6 +33,8 @@
#include <openssl/ssl.h>
#endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,8 +42,8 @@
</span> #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-10-05 21:16:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./attic/random.c 2020-10-08 17:43:39.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./attic/random.c.orig 2021-06-06 21:03:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./attic/random.c 2021-07-28 18:53:02.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;'>@@ -53,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-10-05 21:16:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./include/ntp_machine.h 2020-10-08 17:43:39.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./include/ntp_machine.h.orig 2021-06-06 21:03:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./include/ntp_machine.h 2021-07-28 18:53:02.000000000 -0700
</span> @@ -13,14 +13,145 @@
#ifndef CLOCK_REALTIME
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -207,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-10-05 21:16:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./include/ntp_stdlib.h 2020-10-08 17:43:39.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./include/ntp_stdlib.h.orig 2021-06-06 21:03:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./include/ntp_stdlib.h 2021-07-28 18:53:02.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;'>@@ -219,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-10-05 21:16:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./include/ntp_syscall.h 2020-10-08 17:43:39.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./include/ntp_syscall.h.orig 2021-06-06 21:03:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./include/ntp_syscall.h 2021-07-28 18:53:02.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;'>@@ -233,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-10-05 21:16:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./libntp/clockwork.c 2020-10-08 17:43:39.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./libntp/clockwork.c.orig 2021-06-06 21:03:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./libntp/clockwork.c 2021-07-28 18:53:02.000000000 -0700
</span> @@ -5,8 +5,10 @@
#include "config.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -248,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-10-05 21:16:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./libntp/statestr.c 2020-10-08 17:43:39.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./libntp/statestr.c.orig 2021-06-06 21:03:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./libntp/statestr.c 2021-07-28 18:53:02.000000000 -0700
</span> @@ -12,7 +12,9 @@
#include "lib_strbuf.h"
#include "ntp_refclock.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -350,9 +350,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 2020-10-05 21:16:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./ntpd/ntp_control.c 2020-10-08 17:43:39.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1368,6 +1368,7 @@ ctl_putsys(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./ntpd/ntp_control.c.orig 2021-06-06 21:03:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./ntpd/ntp_control.c 2021-07-28 18:53:02.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1361,6 +1361,7 @@ ctl_putsys(
</span> char str[256];
double dtemp;
const char *ss;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -360,7 +360,7 @@
</span> static struct timex ntx;
static unsigned long ntp_adjtime_time;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1383,6 +1384,7 @@ ctl_putsys(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1376,6 +1377,7 @@ ctl_putsys(
</span> else
ntp_adjtime_time = current_time;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -368,8 +368,8 @@
</span>
switch (varid) {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1782,50 +1784,93 @@ ctl_putsys(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1666,45 +1668,94 @@ ctl_putsys(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CASE_UINT(CS_AUTHRESET, current_time - auth_timereset);
</span>
/*
- * CTL_IF_KERNPPS() puts a zero if kernel hard PPS is not
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -410,13 +410,13 @@
</span> + );
break;
<span style='display:block; white-space:pre;background:#ffe0e0;'>- case CS_K_FREQ:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ctl_putsfp(sys_var[varid].text, ntx.freq);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CASE_SFP(CS_K_FREQ, ntx.freq);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case CS_K_FREQ:
</span> + CTL_IF_KERNLOOP(
+ ctl_putsfp,
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (sys_var[varid].text, ntx.freq)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (CV_NAME, ntx.freq)
</span> + );
<span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ break;
</span>
case CS_K_MAXERR:
- ctl_putdblf(sys_var[varid].text, false, 6,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -447,13 +447,13 @@
</span> ctl_putstr(sys_var[varid].text, ss, strlen(ss));
break;
<span style='display:block; white-space:pre;background:#ffe0e0;'>- case CS_K_TIMECONST:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ctl_putint(sys_var[varid].text, ntx.constant);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CASE_INT(CS_K_TIMECONST, ntx.constant);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case CS_K_TIMECONST:
</span> + CTL_IF_KERNLOOP(
+ ctl_putint,
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (sys_var[varid].text, ntx.constant)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (CV_NAME, ntx.constant)
</span> + );
<span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ break;
</span>
case CS_K_PRECISION:
- ctl_putdblf(sys_var[varid].text, false, 6,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -465,17 +465,18 @@
</span> + );
break;
<span style='display:block; white-space:pre;background:#ffe0e0;'>- case CS_K_FREQTOL:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ctl_putsfp(sys_var[varid].text, ntx.tolerance);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CASE_SFP(CS_K_FREQTOL, ntx.tolerance);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case CS_K_FREQTOL:
</span> + CTL_IF_KERNLOOP(
+ ctl_putsfp,
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (sys_var[varid].text, ntx.tolerance)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (CV_NAME, ntx.tolerance)
</span> + );
<span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ break;
</span>
case CS_K_PPS_FREQ:
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./ntpd/ntp_loopfilter.c.orig 2020-10-05 21:16:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./ntpd/ntp_loopfilter.c 2020-10-08 17:43:39.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CTL_IF_KERNPPS(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./ntpd/ntp_loopfilter.c.orig 2021-06-06 21:03:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./ntpd/ntp_loopfilter.c 2021-07-28 18:53:02.000000000 -0700
</span> @@ -23,8 +23,10 @@
#define NTP_MAXFREQ 500e-6
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -697,8 +698,8 @@
</span> }
}
-
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./ntpd/ntp_timer.c.orig 2020-10-05 21:16:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./ntpd/ntp_timer.c 2020-10-08 17:43:39.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./ntpd/ntp_timer.c.orig 2021-06-06 21:03:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./ntpd/ntp_timer.c 2021-07-28 18:53:02.000000000 -0700
</span> @@ -13,7 +13,9 @@
#include <signal.h>
#include <unistd.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -721,8 +722,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-10-05 21:16:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./ntpd/refclock_local.c 2020-10-08 17:43:39.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./ntpd/refclock_local.c.orig 2021-06-06 21:03:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./ntpd/refclock_local.c 2021-07-28 18:53:02.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;'>@@ -745,8 +746,8 @@
</span> pp->lastref = pp->lastrec;
refclock_receive(peer);
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./ntpfrob/precision.c.orig 2020-10-05 21:16:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./ntpfrob/precision.c 2020-10-08 17:43:39.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./ntpfrob/precision.c.orig 2021-06-06 21:03:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./ntpfrob/precision.c 2021-07-28 18:53:02.000000000 -0700
</span> @@ -11,6 +11,7 @@
#include "ntp_types.h"
#include "ntp_calendar.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -755,8 +756,8 @@
</span>
#define DEFAULT_SYS_PRECISION -99
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./tests/libntp/statestr.c.orig 2020-10-05 21:16:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./tests/libntp/statestr.c 2020-10-08 17:43:39.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./tests/libntp/statestr.c.orig 2021-06-06 21:03:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./tests/libntp/statestr.c 2021-07-28 18:53:02.000000000 -0700
</span> @@ -4,7 +4,9 @@
#include "unity.h"
#include "unity_fixture.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -777,9 +778,9 @@
</span> }
// statustoa
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./wafhelpers/bin_test.py.orig 2020-10-05 21:16:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./wafhelpers/bin_test.py 2020-10-08 17:43:39.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -95,6 +95,12 @@ def cmd_bin_test(ctx, config):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./wafhelpers/bin_test.py.orig 2021-06-06 21:03:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./wafhelpers/bin_test.py 2021-07-28 18:53:02.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -103,6 +103,12 @@ def cmd_bin_test(ctx):
</span> if ctx.env['PYTHON_CURSES']:
cmd_map_python.update(cmd_map_python_curses)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -790,10 +791,10 @@
</span> + del cmd_map[cmd]
+
for cmd in sorted(cmd_map):
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if not run(cmd, cmd_map[cmd], False):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if not run(cmd, cmd_map[cmd] % version):
</span> fails += 1
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./wafhelpers/options.py.orig 2020-10-05 21:16:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./wafhelpers/options.py 2020-10-08 17:43:39.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./wafhelpers/options.py.orig 2021-06-06 21:03:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./wafhelpers/options.py 2021-07-28 18:53:02.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;'>@@ -803,9 +804,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-10-05 21:16:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./wscript 2020-10-08 17:43:39.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -563,7 +563,7 @@ int main(int argc, char **argv) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./wscript.orig 2021-06-06 21:03:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./wscript 2021-07-28 18:53:02.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -562,7 +562,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;'>@@ -814,7 +815,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;'>-@@ -774,6 +774,21 @@ int main(int argc, char **argv) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -776,6 +776,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>