<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/3bac6b8bea6f5407f7878ff04676ec9d2a6dafb1">https://github.com/macports/macports-ports/commit/3bac6b8bea6f5407f7878ff04676ec9d2a6dafb1</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 3bac6b8bea6f5407f7878ff04676ec9d2a6dafb1
</span>Author: Fred Wright <fw@fwright.net>
AuthorDate: Thu Jul 11 20:22:18 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> ntpsec: update to 1.1.6
</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_6
</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, MacBookPro 10.9,
</span><span style='display:block; white-space:pre;color:#404040;'> 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><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> NOTE:
</span><span style='display:block; white-space:pre;color:#404040;'> Does not address ticket 57272 (s/b low priority).
</span>---
sysutils/ntpsec/Portfile | 8 +++---
sysutils/ntpsec/files/patch-PreHighSierra.diff | 34 +++++++++++++-------------
2 files changed, 21 insertions(+), 21 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 4da966d..93af358 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/ntpsec/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/ntpsec/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup waf 1.0
</span> PortGroup python 1.0
name ntpsec
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.1.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.1.6
</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;'>@@ -18,9 +18,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 01cab05c677b01cc03c7fb9af3d76c4189170b54 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 e97211a2f33d4d1ace4b2239556e0c2547ed6fc1eec6e3aab765b24151e5b756 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 2597462
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 b539282b5d15c7541994c65ef24af1d890b25f9f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 8d7c4e41206f7e23727b8b76e06ea0d7d5b13f0afe6ac4c52181c8522e38f79c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2600632
</span>
depends_build port:bison
depends_lib path:lib/libssl.dylib:openssl port:python${python.version}
<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 77168cc..3230733 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> --- ./attic/backwards.c.orig 2019-06-21 19:41:51.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./attic/backwards.c 2019-07-11 17:37:25.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./attic/backwards.c 2019-07-11 17:54:24.000000000 -0700
</span> @@ -7,6 +7,8 @@
#include <stdlib.h>
#include <time.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,7 +10,7 @@
</span>
static void ts_print(struct timespec *ts0, struct timespec *ts1);
--- ./attic/clocks.c.orig 2019-06-21 19:41:51.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./attic/clocks.c 2019-07-11 17:37:25.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./attic/clocks.c 2019-07-11 17:54:24.000000000 -0700
</span> @@ -5,6 +5,8 @@
#include <stdio.h>
#include <time.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,7 +21,7 @@
</span> const int type;
const char* name;
--- ./attic/digest-timing.c.orig 2019-06-21 19:41:51.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./attic/digest-timing.c 2019-07-11 17:37:25.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./attic/digest-timing.c 2019-07-11 17:54:24.000000000 -0700
</span> @@ -34,6 +34,8 @@
#include <openssl/rand.h>
#include <openssl/objects.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,7 +32,7 @@
</span>
#ifndef EVP_MD_CTX_reset
--- ./include/ntp_machine.h.orig 2019-06-21 19:41:51.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./include/ntp_machine.h 2019-07-11 17:37:25.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./include/ntp_machine.h 2019-07-11 17:54:24.000000000 -0700
</span> @@ -13,14 +13,135 @@
#ifndef CLOCK_REALTIME
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -176,7 +176,7 @@
</span> int ntp_set_tod (struct timespec *tvs);
--- ./include/ntp_stdlib.h.orig 2019-06-21 19:41:51.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./include/ntp_stdlib.h 2019-07-11 17:37:25.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./include/ntp_stdlib.h 2019-07-11 17:54:24.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;'>@@ -188,7 +188,7 @@
</span> extern sockaddr_u * netof6 (sockaddr_u *);
extern const char * socktoa (const sockaddr_u *);
--- ./include/ntp_syscall.h.orig 2019-06-21 19:41:51.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./include/ntp_syscall.h 2019-07-11 17:37:25.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./include/ntp_syscall.h 2019-07-11 17:54:24.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;'>@@ -202,7 +202,7 @@
</span> /*
* The units of the maxerror and esterror fields vary by platform. If
--- ./libntp/clockwork.c.orig 2019-06-21 19:41:51.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./libntp/clockwork.c 2019-07-11 17:37:25.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./libntp/clockwork.c 2019-07-11 17:54:24.000000000 -0700
</span> @@ -5,8 +5,10 @@
#include "config.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -217,7 +217,7 @@
</span> #include "ntp.h"
#include "ntp_machine.h"
--- ./libntp/statestr.c.orig 2019-06-21 19:41:51.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./libntp/statestr.c 2019-07-11 17:37:25.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./libntp/statestr.c 2019-07-11 17:54:24.000000000 -0700
</span> @@ -12,7 +12,9 @@
#include "lib_strbuf.h"
#include "ntp_refclock.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -319,7 +319,7 @@
</span> /*
* statustoa - return a descriptive string for a peer status
--- ./ntpd/ntp_control.c.orig 2019-06-30 00:21:32.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./ntpd/ntp_control.c 2019-07-11 17:37:25.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./ntpd/ntp_control.c 2019-07-11 17:54:24.000000000 -0700
</span> @@ -1357,6 +1357,7 @@ ctl_putsys(
char str[256];
double dtemp;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -443,7 +443,7 @@
</span>
case CS_K_PPS_FREQ:
--- ./ntpd/ntp_loopfilter.c.orig 2019-06-21 19:41:51.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./ntpd/ntp_loopfilter.c 2019-07-11 17:37:25.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./ntpd/ntp_loopfilter.c 2019-07-11 17:54:24.000000000 -0700
</span> @@ -23,8 +23,10 @@
#define NTP_MAXFREQ 500e-6
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -680,7 +680,7 @@
</span> -#endif /* SIGSYS */
+#endif /* HAVE_KERNEL_PLL && SIGSYS */
--- ./ntpd/ntp_timer.c.orig 2019-06-21 19:41:51.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./ntpd/ntp_timer.c 2019-07-11 17:37:25.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./ntpd/ntp_timer.c 2019-07-11 17:54:24.000000000 -0700
</span> @@ -13,7 +13,9 @@
#include <signal.h>
#include <unistd.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -704,7 +704,7 @@
</span> leap_smear.enabled = (leap_smear_intv != 0);
#endif
--- ./ntpd/refclock_local.c.orig 2019-06-21 19:41:51.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./ntpd/refclock_local.c 2019-07-11 17:37:25.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./ntpd/refclock_local.c 2019-07-11 17:54:24.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;'>@@ -728,7 +728,7 @@
</span> refclock_receive(peer);
}
--- ./ntpfrob/precision.c.orig 2019-06-21 19:41:51.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./ntpfrob/precision.c 2019-07-11 17:37:25.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./ntpfrob/precision.c 2019-07-11 17:54:24.000000000 -0700
</span> @@ -11,6 +11,7 @@
#include "ntp_types.h"
#include "ntp_calendar.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -738,7 +738,7 @@
</span> #define DEFAULT_SYS_PRECISION -99
--- ./tests/libntp/statestr.c.orig 2019-06-21 19:41:51.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./tests/libntp/statestr.c 2019-07-11 17:37:25.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./tests/libntp/statestr.c 2019-07-11 17:54:24.000000000 -0700
</span> @@ -4,7 +4,9 @@
#include "unity.h"
#include "unity_fixture.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -760,7 +760,7 @@
</span>
// statustoa
--- ./wafhelpers/bin_test.py.orig 2019-06-21 19:41:51.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./wafhelpers/bin_test.py 2019-07-11 17:37:25.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./wafhelpers/bin_test.py 2019-07-11 17:54:24.000000000 -0700
</span> @@ -91,6 +91,12 @@ def cmd_bin_test(ctx, config):
for cmd in cmd_map3:
cmd_map2[cmd] = cmd_map3[cmd]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -775,7 +775,7 @@
</span> if not run(cmd, cmd_map[cmd], False):
fails += 1
--- ./wafhelpers/options.py.orig 2019-06-21 19:41:51.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./wafhelpers/options.py 2019-07-11 17:37:25.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./wafhelpers/options.py 2019-07-11 17:54:24.000000000 -0700
</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;'>@@ -786,7 +786,7 @@
</span> default=False, help="Disable MDNS registration.")
grp.add_option(
--- ./wscript.orig 2019-06-21 19:41:51.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./wscript 2019-07-11 17:37:25.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./wscript 2019-07-11 17:54:24.000000000 -0700
</span> @@ -593,7 +593,7 @@ int main(int argc, char **argv) {
structures = (
("struct if_laddrconf", ["sys/types.h", "net/if6.h"], False),
</pre><pre style='margin:0'>
</pre>