<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/ad9f17cfe40729fa52b0468f75ec633364f4e71f">https://github.com/macports/macports-ports/commit/ad9f17cfe40729fa52b0468f75ec633364f4e71f</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 ad9f17cfe40 ntpsec: Fix build failure with clang 14.
</span>ad9f17cfe40 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit ad9f17cfe40729fa52b0468f75ec633364f4e71f
</span>Author: Fred Wright <fw@fwright.net>
AuthorDate: Tue Nov 29 14:48:31 2022 -0800
<span style='display:block; white-space:pre;color:#404040;'> ntpsec: Fix build failure with clang 14.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This was actually just a test failure in a corner case, but since the
</span><span style='display:block; white-space:pre;color:#404040;'> tests are run as part of the build, the build was failing. The build
</span><span style='display:block; white-space:pre;color:#404040;'> originally worked on 12.x Monterey, but failed after upgrading to
</span><span style='display:block; white-space:pre;color:#404040;'> Xcode 14, and building on 13.x Ventura never worked.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> There was already a one-line upstream fix for this, which is
</span><span style='display:block; white-space:pre;color:#404040;'> backported here.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also, the Python programs lacked a versioned shebang line, causing
</span><span style='display:block; white-space:pre;color:#404040;'> them to fail whenever the default Python wasn't python27. This also
</span><span style='display:block; white-space:pre;color:#404040;'> now fixed.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Since installed content is changed, this includes a revbump.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This doesn't bother to fix the minor lint warning about a duplicate
</span><span style='display:block; white-space:pre;color:#404040;'> pkgconfig dependency.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> As usual, the patchfile is derived from a GitLab fork, and the overall
</span><span style='display:block; white-space:pre;color:#404040;'> diffs can 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_2_1r4
</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) on
</span><span style='display:block; white-space:pre;color:#404040;'> 10.4-10.5 ppc, 10.4-10.6 i386, 10.6-10.15 x86_64, and 11.x-13.x arm64.
</span>---
sysutils/ntpsec/Portfile | 3 +-
sysutils/ntpsec/files/patch-allfixes.diff | 89 ++++++++++++++++++-------------
2 files changed, 53 insertions(+), 39 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 22919b2f17b..53bf1f16c1f 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;'>@@ -7,7 +7,7 @@ PortGroup openssl 1.0
</span>
name ntpsec
version 1.2.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 4
</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;'>@@ -72,6 +72,7 @@ configure.args --alltests \
</span> --disable-manpage \
--python=${python.bin} \
--enable-pylib=ext \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --pyshebang=${python.bin} \
</span> --pythondir=${python.pkgd} \
--pythonarchdir=${python.pkgd}
# Make sure we use waf, not setup.py for build
<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 4e6bf89427a..d485714be1e 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 2021-11-20 13:51:42.000000000 -0800
</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 2022-11-28 16:18:24.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 2021-11-20 13:51:42.000000000 -0800
</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 2022-11-28 16:18:24.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 2021-11-20 13:51:42.000000000 -0800
</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 2022-11-28 16:18:24.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 2021-11-20 13:51:42.000000000 -0800
</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 2022-11-28 16:18:24.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 2021-11-20 13:51:42.000000000 -0800
</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 2022-11-28 16:18:24.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,8 +53,21 @@
</span> #define BATCHSIZE 1000000
#define BILLION 1000000000
#define HISTSIZE 2500
<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 2021-11-20 13:51:42.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- include/ntp_fp.h.orig 2021-06-06 21:03:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ include/ntp_fp.h 2022-11-28 16:18:24.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -112,8 +112,9 @@ typedef struct {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Operations on the long fp format. The only reason these aren't
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * native operations is to be independent of whether the l_fp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * type is signed or unsigned.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * Can l_fp ever be signed??
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define L_NEG(v) (v) = (l_fp)(-(int64_t)(v))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define L_NEG(v) (v) = -(v)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define L_ISNEG(v) M_ISNEG(lfpuint(v))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define L_ISGT(a, b) ((int64_t)(a) > (int64_t)(b))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define L_ISGTU(a, b) ((a) > (b))
</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 2022-11-28 16:18:24.000000000 -0800
</span> @@ -13,14 +13,145 @@
#ifndef CLOCK_REALTIME
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -207,8 +220,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 2021-11-20 13:51:42.000000000 -0800
</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 2022-11-28 16:18:24.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;'>@@ -219,8 +232,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 2021-11-20 13:51:42.000000000 -0800
</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 2022-11-28 16:18:24.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;'>@@ -233,8 +246,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 2021-11-20 13:51:42.000000000 -0800
</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 2022-11-28 16:18:24.000000000 -0800
</span> @@ -5,8 +5,10 @@
#include "config.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -248,8 +261,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 2021-11-20 13:51:42.000000000 -0800
</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 2022-11-28 16:18:24.000000000 -0800
</span> @@ -12,7 +12,9 @@
#include "lib_strbuf.h"
#include "ntp_refclock.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -350,8 +363,8 @@
</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 2021-11-20 13:51:42.000000000 -0800
</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 2022-11-28 16:18:24.000000000 -0800
</span> @@ -1361,6 +1361,7 @@ ctl_putsys(
char str[256];
double dtemp;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -475,8 +488,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 2021-11-20 13:51:42.000000000 -0800
</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 2022-11-28 16:18:24.000000000 -0800
</span> @@ -23,8 +23,10 @@
#define NTP_MAXFREQ 500e-6
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -698,8 +711,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 2021-11-20 13:51:42.000000000 -0800
</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 2022-11-28 16:18:24.000000000 -0800
</span> @@ -13,7 +13,9 @@
#include <signal.h>
#include <unistd.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -722,8 +735,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 2021-11-20 13:51:42.000000000 -0800
</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 2022-11-28 16:18:24.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;'>@@ -746,8 +759,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 2021-11-20 13:51:42.000000000 -0800
</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 2022-11-28 16:18:24.000000000 -0800
</span> @@ -11,6 +11,7 @@
#include "ntp_types.h"
#include "ntp_calendar.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -756,8 +769,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 2021-11-20 13:51:42.000000000 -0800
</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 2022-11-28 16:18:24.000000000 -0800
</span> @@ -4,7 +4,9 @@
#include "unity.h"
#include "unity_fixture.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -778,8 +791,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 2021-11-20 13:51:42.000000000 -0800
</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 2022-11-28 16:18:24.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;'>@@ -793,8 +806,8 @@
</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 2021-11-20 13:51:42.000000000 -0800
</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 2022-11-28 16:18:24.000000000 -0800
</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;'>@@ -804,8 +817,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 2021-06-06 21:03:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./wscript 2021-11-20 13:51:42.000000000 -0800
</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 2022-11-28 16:18:24.000000000 -0800
</span> @@ -562,7 +562,7 @@ int main(int argc, char **argv) {
structures = (
("struct if_laddrconf", ["sys/types.h", "net/if6.h"], False),
</pre><pre style='margin:0'>
</pre>