<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f6baa101ce0818c897e29186022a7f3d2a31448c">https://github.com/macports/macports-ports/commit/f6baa101ce0818c897e29186022a7f3d2a31448c</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit f6baa101ce0818c897e29186022a7f3d2a31448c
</span>Author: Fred Wright <fw@fwright.net>
AuthorDate: Fri Nov 29 22:49:59 2019 -0800
<span style='display:block; white-space:pre;color:#404040;'> ntpsec: update to 1.1.8
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This includes the patches for compatibility with macOS<10.13,
</span><span style='display:block; white-space:pre;color:#404040;'> which can also be seen (more readably) at:
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> https://gitlab.com/fhgwright/ntpsec/tree/macports_1_1_8
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> TESTED:
</span><span style='display:block; white-space:pre;color:#404040;'> Built and ran on MacPro 10.9, MacPro 10.14 MacPro 10.15, MacBookPro
</span><span style='display:block; white-space:pre;color:#404040;'> 10.9, PowerBook 10.5, and VMs for 10.5-10.13. Built with default
</span><span style='display:block; white-space:pre;color:#404040;'> variants, all single non-default variants, and all non-default
</span><span style='display:block; white-space:pre;color:#404040;'> variants.
</span>---
sysutils/ntpsec/Portfile | 10 ++--
sysutils/ntpsec/files/patch-PreHighSierra.diff | 82 +++++++++++++-------------
2 files changed, 46 insertions(+), 46 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 6769d07..75d501b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/ntpsec/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/ntpsec/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,8 +5,8 @@ PortGroup waf 1.0
</span> PortGroup python 1.0
name ntpsec
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.1.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.1.8
</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;'>@@ -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 4f88807fc4652d2bb0608ca82df5b7e6be18eb63 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 48eb3e0ed932fccc21373bc34a344b0c7164fda637f9b822b85b146f1aea398b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 2534524
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 50b7c2729118e23bf1b45fad5bc74430690c84c7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 8445827a4d5029da508a11e9c8e7958db839f73b39de612ab3909244f89a1340 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2589363
</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 776855b..bec895b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/ntpsec/files/patch-PreHighSierra.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/ntpsec/files/patch-PreHighSierra.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./attic/backwards.c.orig 2019-09-02 19:17:36.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./attic/backwards.c 2019-09-03 22:22:14.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./attic/backwards.c.orig 2019-11-17 14:18:12.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./attic/backwards.c 2019-11-23 17:54:09.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 2019-09-02 19:17:36.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./attic/clocks.c 2019-09-03 22:22:14.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./attic/clocks.c.orig 2019-11-17 14:18:12.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./attic/clocks.c 2019-11-23 17:54:09.000000000 -0800
</span> @@ -5,6 +5,8 @@
#include <stdio.h>
#include <time.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,8 +20,8 @@
</span> struct table {
const int type;
const char* name;
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./attic/digest-timing.c.orig 2019-09-02 19:17:36.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./attic/digest-timing.c 2019-09-03 22:22:14.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./attic/digest-timing.c.orig 2019-11-17 14:18:12.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./attic/digest-timing.c 2019-11-23 17:54:09.000000000 -0800
</span> @@ -34,6 +34,8 @@
#include <openssl/rand.h>
#include <openssl/objects.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,8 +31,8 @@
</span> #define UNUSED_ARG(arg) ((void)(arg))
#ifndef EVP_MD_CTX_reset
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./include/ntp_machine.h.orig 2019-09-02 19:17:36.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./include/ntp_machine.h 2019-09-03 22:22:14.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./include/ntp_machine.h.orig 2019-11-17 14:18:12.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./include/ntp_machine.h 2019-11-23 17:54:09.000000000 -0800
</span> @@ -13,14 +13,145 @@
#ifndef CLOCK_REALTIME
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -185,9 +185,9 @@
</span>
int ntp_set_tod (struct timespec *tvs);
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./include/ntp_stdlib.h.orig 2019-09-02 19:17:36.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./include/ntp_stdlib.h 2019-09-03 22:22:14.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -96,7 +96,9 @@ extern const char * eventstr (int);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./include/ntp_stdlib.h.orig 2019-11-17 14:18:12.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./include/ntp_stdlib.h 2019-11-23 17:54:09.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -95,7 +95,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;'>@@ -195,10 +195,10 @@
</span> extern const char * k_st_flags (uint32_t);
+#endif
extern char * statustoa (int, int);
<span style='display:block; white-space:pre;background:#ffe0e0;'>- extern sockaddr_u * netof6 (sockaddr_u *);
</span> extern const char * socktoa (const sockaddr_u *);
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./include/ntp_syscall.h.orig 2019-09-02 19:17:36.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./include/ntp_syscall.h 2019-09-03 22:22:14.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern const char * socktoa_r (const sockaddr_u *sock, char *buf, size_t buflen);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./include/ntp_syscall.h.orig 2019-11-17 14:18:12.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./include/ntp_syscall.h 2019-11-23 17:54:09.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;'>@@ -211,8 +211,8 @@
</span>
/*
* The units of the maxerror and esterror fields vary by platform. If
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./libntp/clockwork.c.orig 2019-09-02 19:17:36.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./libntp/clockwork.c 2019-09-03 22:22:14.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./libntp/clockwork.c.orig 2019-11-17 14:18:12.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./libntp/clockwork.c 2019-11-23 17:54:09.000000000 -0800
</span> @@ -5,8 +5,10 @@
#include "config.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -226,8 +226,8 @@
</span>
#include "ntp.h"
#include "ntp_machine.h"
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./libntp/statestr.c.orig 2019-09-02 19:17:36.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./libntp/statestr.c 2019-09-03 22:22:14.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./libntp/statestr.c.orig 2019-11-17 14:18:12.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./libntp/statestr.c 2019-11-23 17:54:09.000000000 -0800
</span> @@ -12,7 +12,9 @@
#include "lib_strbuf.h"
#include "ntp_refclock.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -328,8 +328,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 2019-09-02 19:17:36.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./ntpd/ntp_control.c 2019-09-03 22:22:14.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./ntpd/ntp_control.c.orig 2019-11-17 14:18:12.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./ntpd/ntp_control.c 2019-11-23 17:54:09.000000000 -0800
</span> @@ -1359,6 +1359,7 @@ ctl_putsys(
char str[256];
double dtemp;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -452,8 +452,8 @@
</span> break;
case CS_K_PPS_FREQ:
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./ntpd/ntp_loopfilter.c.orig 2019-09-02 19:17:36.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./ntpd/ntp_loopfilter.c 2019-09-03 22:22:14.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./ntpd/ntp_loopfilter.c.orig 2019-11-17 14:18:12.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./ntpd/ntp_loopfilter.c 2019-11-23 17:54:09.000000000 -0800
</span> @@ -23,8 +23,10 @@
#define NTP_MAXFREQ 500e-6
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -689,8 +689,8 @@
</span> }
-#endif /* SIGSYS */
+#endif /* HAVE_KERNEL_PLL && SIGSYS */
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./ntpd/ntp_timer.c.orig 2019-09-02 19:17:36.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./ntpd/ntp_timer.c 2019-09-03 22:22:14.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./ntpd/ntp_timer.c.orig 2019-11-17 14:18:12.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./ntpd/ntp_timer.c 2019-11-23 17:54:09.000000000 -0800
</span> @@ -13,7 +13,9 @@
#include <signal.h>
#include <unistd.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -713,8 +713,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 2019-09-02 19:17:36.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./ntpd/refclock_local.c 2019-09-03 22:22:14.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./ntpd/refclock_local.c.orig 2019-11-17 14:18:12.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./ntpd/refclock_local.c 2019-11-23 17:54:09.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;'>@@ -737,8 +737,8 @@
</span> pp->lastref = pp->lastrec;
refclock_receive(peer);
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./ntpfrob/precision.c.orig 2019-09-02 19:17:36.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./ntpfrob/precision.c 2019-09-03 22:22:14.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./ntpfrob/precision.c.orig 2019-11-17 14:18:12.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./ntpfrob/precision.c 2019-11-23 17:54:09.000000000 -0800
</span> @@ -11,6 +11,7 @@
#include "ntp_types.h"
#include "ntp_calendar.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -747,8 +747,8 @@
</span>
#define DEFAULT_SYS_PRECISION -99
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./tests/libntp/statestr.c.orig 2019-09-02 19:17:36.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./tests/libntp/statestr.c 2019-09-03 22:22:14.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./tests/libntp/statestr.c.orig 2019-11-17 14:18:12.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./tests/libntp/statestr.c 2019-11-23 17:54:09.000000000 -0800
</span> @@ -4,7 +4,9 @@
#include "unity.h"
#include "unity_fixture.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -769,11 +769,11 @@
</span> }
// statustoa
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./wafhelpers/bin_test.py.orig 2019-09-02 19:17:36.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./wafhelpers/bin_test.py 2019-09-03 22:22:14.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -91,6 +91,12 @@ def cmd_bin_test(ctx, config):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for cmd in cmd_map3:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cmd_map2[cmd] = cmd_map3[cmd]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./wafhelpers/bin_test.py.orig 2019-11-17 14:18:12.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./wafhelpers/bin_test.py 2019-11-23 17:54:09.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -97,6 +97,12 @@ def cmd_bin_test(ctx, config):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ctx.env['PYTHON_CURSES']:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cmd_map_python.update(cmd_map_python_curses)
</span>
+ # Kludge to remove ntptime if it didn't get built
+ if not ctx.env.HEADER_SYS_TIMEX_H:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -784,8 +784,8 @@
</span> for cmd in sorted(cmd_map):
if not run(cmd, cmd_map[cmd], False):
fails += 1
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./wafhelpers/options.py.orig 2019-09-02 19:17:36.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./wafhelpers/options.py 2019-09-03 22:22:14.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./wafhelpers/options.py.orig 2019-11-17 14:18:12.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./wafhelpers/options.py 2019-11-23 17:54:09.000000000 -0800
</span> @@ -19,6 +19,8 @@ def options_cmd(ctx, config):
help="Droproot earlier (breaks SHM and NetBSD).")
grp.add_option('--enable-seccomp', action='store_true',
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -795,9 +795,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 2019-09-02 19:17:36.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./wscript 2019-09-03 22:22:14.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -593,7 +593,7 @@ int main(int argc, char **argv) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./wscript.orig 2019-11-17 14:18:12.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./wscript 2019-11-23 17:54:09.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -592,7 +592,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;'>@@ -806,7 +806,7 @@
</span> ("struct ntptimeval", ["sys/time.h", "sys/timex.h"], False),
)
for (s, h, r) in structures:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -798,6 +798,21 @@ int main(int argc, char **argv) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -797,6 +797,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>