<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/5cdba34446d4814f96e018a57c80bb5d028ef0c5">https://github.com/macports/macports-ports/commit/5cdba34446d4814f96e018a57c80bb5d028ef0c5</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 5cdba34446d ntpsec: update to 1.2.2
</span>5cdba34446d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 5cdba34446d4814f96e018a57c80bb5d028ef0c5
</span>Author: Fred Wright <fw@fwright.net>
AuthorDate: Tue Jan 3 22:21:32 2023 -0800
<span style='display:block; white-space:pre;color:#404040;'> ntpsec: update to 1.2.2
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Moves to OpenSSL 3, now that in can build correctly with it.
</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_2
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Note that 10.5 x86_64 remains broken and is disabled.
</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 tests on 10.4-10.5 ppc, 10.4-10.6 i386, 10.6-10.15
</span><span style='display:block; white-space:pre;color:#404040;'> x86_64, and 11.x-13.x arm64.
</span>---
sysutils/ntpsec/Portfile | 25 +++----
sysutils/ntpsec/files/patch-allfixes.diff | 113 ++++++++++++------------------
2 files changed, 54 insertions(+), 84 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 53bf1f16c1f..c55fac0a582 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;'>@@ -6,8 +6,8 @@ PortGroup python 1.0
</span> PortGroup openssl 1.0
name ntpsec
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.2.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.2.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</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;'>@@ -20,9 +20,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 ca5d758bf6572b460ba8e8c8e70f09b8a7417fd0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 f2684835116c80b8f21782a5959a805ba3c44e3a681dd6c17c7cb00cc242c27a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 2681237
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 60b8c64a75d27d8e34db51c17050ccecc182f972 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 2f2848760b915dfe185b9217f777738b36ceeb78a7fc208b7e74e039dec22df5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2710329
</span>
# 10.5 x86_64 builds successfully and passes all build tests, but doesn't
# actually work. This has apparently been true forever, but until recently,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,6 +30,8 @@ checksums rmd160 ca5d758bf6572b460ba8e8c8e70f09b8a7417fd0 \
</span> # and not really a regression, we simply disallow it for now. It's unknown
# whether 10.4 x86_64 has the same issue, but we also disallow that out of
# conservatism. This should be removed once the code is fixed.
<span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# This bug has been verified as still present as of 1.2.2.
</span> if { ${os.platform} eq "darwin" && ${os.major} < 10 } {
supported_archs i386 ppc
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,16 +49,7 @@ python.versions 27
</span> # Also note that the new ffi-based Python client library doesn't work properly
# on the Mac, so we use the old extension-based version.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# The installed ntpsec code builds correctly with openssl3, though one of
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# the "attic" programs included (erroneously) in the default build does not.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Although this is easily fixed, openssl3 itself currently fails to build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# in certain cases, so we keep this on openssl11 for now.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Since OpenSSL 1.1 is still fully supported, adequate for ntpsec, and has no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# licensing issues for ntpsec, there's no rush to move to OpenSSL 3, which might
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# as well wait for the next ntpsec release (or later, if openssl3 isn't fully
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# fixed by then).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-openssl.branch 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+openssl.branch 3
</span> # NOTE: doesn't work with libressl
depends_build-append port:bison port:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -82,6 +75,8 @@ destroot.cmd ${build.cmd}
</span> # Although the normal build procedure includes the tests, we also allow
# them separately so that "port test" works.
test.run yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Override the python portgroup's inappropriate test.cmd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.cmd ${build.cmd}
</span> test.target check
default_variants +doc
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/ntpsec/files/patch-allfixes.diff b/sysutils/ntpsec/files/patch-allfixes.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index d485714be1e..decdc41a947 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/ntpsec/files/patch-allfixes.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/ntpsec/files/patch-allfixes.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 2021-06-06 21:03:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ attic/backwards.c 2022-11-28 16:18:24.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- attic/backwards.c.orig 2022-12-22 22:08:52.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ attic/backwards.c 2022-12-30 00:59:15.000000000 -0800
</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 2021-06-06 21:03:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ attic/clocks.c 2022-11-28 16:18:24.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- attic/clocks.c.orig 2022-12-22 22:08:52.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ attic/clocks.c 2022-12-30 00:59:15.000000000 -0800
</span> @@ -9,6 +9,8 @@
#include <unistd.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/cmac-timing.c.orig 2021-06-06 21:03:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ attic/cmac-timing.c 2022-11-28 16:18:24.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- attic/cmac-timing.c.orig 2022-12-22 22:08:52.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ attic/cmac-timing.c 2022-12-30 00:59:15.000000000 -0800
</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 2021-06-06 21:03:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ attic/digest-timing.c 2022-11-28 16:18:24.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- attic/digest-timing.c.orig 2022-12-22 22:08:52.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ attic/digest-timing.c 2022-12-30 00:59:15.000000000 -0800
</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 2021-06-06 21:03:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ attic/random.c 2022-11-28 16:18:24.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- attic/random.c.orig 2022-12-22 22:08:52.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ attic/random.c 2022-12-30 00:59:15.000000000 -0800
</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,21 +53,8 @@
</span> #define BATCHSIZE 1000000
#define BILLION 1000000000
#define HISTSIZE 2500
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- include/ntp_fp.h.orig 2021-06-06 21:03:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/ntp_fp.h 2022-11-28 16:18:24.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -112,8 +112,9 @@ typedef struct {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Operations on the long fp format. The only reason these aren't
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * native operations is to be independent of whether the l_fp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * type is signed or unsigned.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * Can l_fp ever be signed??
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define L_NEG(v) (v) = (l_fp)(-(int64_t)(v))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define L_NEG(v) (v) = -(v)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define L_ISNEG(v) M_ISNEG(lfpuint(v))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define L_ISGT(a, b) ((int64_t)(a) > (int64_t)(b))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define L_ISGTU(a, b) ((a) > (b))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- include/ntp_machine.h.orig 2021-06-06 21:03:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/ntp_machine.h 2022-11-28 16:18:24.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- include/ntp_machine.h.orig 2022-12-22 22:08:52.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ include/ntp_machine.h 2022-12-30 00:59:15.000000000 -0800
</span> @@ -13,14 +13,145 @@
#ifndef CLOCK_REALTIME
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -220,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 2021-06-06 21:03:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/ntp_stdlib.h 2022-11-28 16:18:24.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- include/ntp_stdlib.h.orig 2022-12-22 22:08:52.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ include/ntp_stdlib.h 2022-12-30 00:59:15.000000000 -0800
</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;'>@@ -232,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 2021-06-06 21:03:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/ntp_syscall.h 2022-11-28 16:18:24.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- include/ntp_syscall.h.orig 2022-12-22 22:08:52.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ include/ntp_syscall.h 2022-12-30 00:59:15.000000000 -0800
</span> @@ -9,9 +9,11 @@
#ifndef GUARD_NTP_SYSCALL_H
#define GUARD_NTP_SYSCALL_H
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -246,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 2021-06-06 21:03:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libntp/clockwork.c 2022-11-28 16:18:24.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libntp/clockwork.c.orig 2022-12-22 22:08:52.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libntp/clockwork.c 2022-12-30 00:59:15.000000000 -0800
</span> @@ -5,8 +5,10 @@
#include "config.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -261,8 +248,8 @@
</span>
#include "ntp.h"
#include "ntp_machine.h"
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- libntp/statestr.c.orig 2021-06-06 21:03:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libntp/statestr.c 2022-11-28 16:18:24.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libntp/statestr.c.orig 2022-12-22 22:08:52.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libntp/statestr.c 2022-12-30 00:59:15.000000000 -0800
</span> @@ -12,7 +12,9 @@
#include "lib_strbuf.h"
#include "ntp_refclock.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -363,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 2021-06-06 21:03:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ntpd/ntp_control.c 2022-11-28 16:18:24.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1361,6 +1361,7 @@ ctl_putsys(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ntpd/ntp_control.c.orig 2022-12-22 22:08:52.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ntpd/ntp_control.c 2022-12-30 00:59:15.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1388,6 +1388,7 @@ ctl_putsys(
</span> char str[256];
double dtemp;
const char *ss;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -373,7 +360,7 @@
</span> static struct timex ntx;
static unsigned long ntp_adjtime_time;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1376,6 +1377,7 @@ ctl_putsys(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1403,6 +1404,7 @@ ctl_putsys(
</span> else
ntp_adjtime_time = current_time;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -381,7 +368,7 @@
</span>
switch (varid) {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1666,45 +1668,94 @@ ctl_putsys(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1703,45 +1705,94 @@ ctl_putsys(
</span> CASE_UINT(CS_AUTHRESET, current_time - auth_timereset);
/*
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -488,8 +475,8 @@
</span>
case CS_K_PPS_FREQ:
CTL_IF_KERNPPS(
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- ntpd/ntp_loopfilter.c.orig 2021-06-06 21:03:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ntpd/ntp_loopfilter.c 2022-11-28 16:18:24.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ntpd/ntp_loopfilter.c.orig 2022-12-22 22:08:52.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ntpd/ntp_loopfilter.c 2022-12-30 00:59:15.000000000 -0800
</span> @@ -23,8 +23,10 @@
#define NTP_MAXFREQ 500e-6
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -711,8 +698,8 @@
</span> }
}
-
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- ntpd/ntp_timer.c.orig 2021-06-06 21:03:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ntpd/ntp_timer.c 2022-11-28 16:18:24.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ntpd/ntp_timer.c.orig 2022-12-22 22:08:52.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ntpd/ntp_timer.c 2022-12-30 00:59:15.000000000 -0800
</span> @@ -13,7 +13,9 @@
#include <signal.h>
#include <unistd.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -735,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 2021-06-06 21:03:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ntpd/refclock_local.c 2022-11-28 16:18:24.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ntpd/refclock_local.c.orig 2022-12-22 22:08:52.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ntpd/refclock_local.c 2022-12-30 00:59:15.000000000 -0800
</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;'>@@ -759,8 +746,8 @@
</span> pp->lastref = pp->lastrec;
refclock_receive(peer);
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- ntpfrob/precision.c.orig 2021-06-06 21:03:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ntpfrob/precision.c 2022-11-28 16:18:24.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ntpfrob/precision.c.orig 2022-12-22 22:08:52.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ntpfrob/precision.c 2022-12-30 00:59:15.000000000 -0800
</span> @@ -11,6 +11,7 @@
#include "ntp_types.h"
#include "ntp_calendar.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -769,8 +756,8 @@
</span>
#define DEFAULT_SYS_PRECISION -99
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- tests/libntp/statestr.c.orig 2021-06-06 21:03:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tests/libntp/statestr.c 2022-11-28 16:18:24.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tests/libntp/statestr.c.orig 2022-12-22 22:08:52.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tests/libntp/statestr.c 2022-12-30 00:59:15.000000000 -0800
</span> @@ -4,7 +4,9 @@
#include "unity.h"
#include "unity_fixture.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -791,8 +778,8 @@
</span> }
// statustoa
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- wafhelpers/bin_test.py.orig 2021-06-06 21:03:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ wafhelpers/bin_test.py 2022-11-28 16:18:24.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- wafhelpers/bin_test.py.orig 2022-12-22 22:08:52.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ wafhelpers/bin_test.py 2022-12-30 00:59:15.000000000 -0800
</span> @@ -103,6 +103,12 @@ def cmd_bin_test(ctx):
if ctx.env['PYTHON_CURSES']:
cmd_map_python.update(cmd_map_python_curses)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -806,9 +793,9 @@
</span> for cmd in sorted(cmd_map):
if not run(cmd, cmd_map[cmd] % version):
fails += 1
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- wafhelpers/options.py.orig 2021-06-06 21:03:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ wafhelpers/options.py 2022-11-28 16:18:24.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -21,6 +21,8 @@ def options_cmd(ctx, config):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- wafhelpers/options.py.orig 2022-12-22 22:08:52.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ wafhelpers/options.py 2022-12-30 00:59:15.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23,6 +23,8 @@ def options_cmd(ctx, config):
</span> help="Droproot earlier (breaks SHM and NetBSD).")
grp.add_option('--enable-seccomp', action='store_true',
default=False, help="Enable seccomp (restricts syscalls).")
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -817,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 2021-06-06 21:03:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ wscript 2022-11-28 16:18:24.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -562,7 +562,7 @@ int main(int argc, char **argv) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- wscript.orig 2022-12-22 22:08:52.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ wscript 2022-12-30 00:59:15.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -585,7 +585,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;'>@@ -828,19 +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;'>-@@ -619,6 +619,11 @@ int main(int argc, char **argv) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ctx.check_cc(msg="Checking for OpenSSL's crypto library",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib="crypto", mandatory=True)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # KLUDGE: Make sure selected SSL version is seen before system's.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # Assumes that CRYPTO and SSL paths are the same.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ctx.env.INCLUDES = ctx.env.INCLUDES_CRYPTO + ctx.env.INCLUDES
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ctx.env.LIBPATH = ctx.env.LIBPATH_CRYPTO + ctx.env.LIBPATH
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Optional functions. Do all function checks here, otherwise
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # we're likely to duplicate them.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- optional_functions = (
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -776,6 +781,21 @@ int main(int argc, char **argv) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -808,6 +808,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>