Skip to content
Permalink
Browse files

ntpsec: update to 1.1.5

This includes the patches for compatibility with macOS<10.13,
which can also be seen (more readably) at:

    https://gitlab.com/fhgwright/ntpsec/tree/macports_1_1_5

TESTED:
Built and ran on MacPro 10.9, MacPro 10.14, MacBookPro 10.9,
PowerBook 10.5, and VMs for 10.5-10.13.  Built with default
variants, all single non-default variants, and all non-default
variants.

NOTE:
Does not address ticket 57272 (s/b low priority).
  • Loading branch information...
fhgwright authored and pmetzger committed Jul 12, 2019
1 parent 0a2a29f commit ad752b264e0a75f3f584c9f9eb9396cf3490161c
Showing with 22 additions and 22 deletions.
  1. +4 −4 sysutils/ntpsec/Portfile
  2. +18 −18 sysutils/ntpsec/files/patch-PreHighSierra.diff
@@ -5,7 +5,7 @@ PortGroup waf 1.0
PortGroup python 1.0

name ntpsec
version 1.1.4
version 1.1.5
categories sysutils net
maintainers {fwright.net:fw @fhgwright} openmaintainer
description A secure, hardened, and improved implementation of NTP
@@ -18,9 +18,9 @@ homepage https://www.ntpsec.org/
conflicts ntp openntpd

master_sites ftp://ftp.ntpsec.org/pub/releases/
checksums rmd160 9d4f0363f383ffe9efd3470635d5960eae5399f1 \
sha256 76f1b993f9853b68b6b1724e1906e5c076470082d8ba11b3b849a94ae56465ef \
size 2536268
checksums rmd160 01cab05c677b01cc03c7fb9af3d76c4189170b54 \
sha256 e97211a2f33d4d1ace4b2239556e0c2547ed6fc1eec6e3aab765b24151e5b756 \
size 2597462

depends_build port:bison
depends_lib path:lib/libssl.dylib:openssl port:python${python.version}
@@ -1,5 +1,5 @@
--- ./attic/backwards.c.orig 2019-06-21 19:41:51.000000000 -0700
+++ ./attic/backwards.c 2019-07-02 11:55:05.000000000 -0700
+++ ./attic/backwards.c 2019-07-11 17:37:25.000000000 -0700
@@ -7,6 +7,8 @@
#include <stdlib.h>
#include <time.h>
@@ -10,7 +10,7 @@

static void ts_print(struct timespec *ts0, struct timespec *ts1);
--- ./attic/clocks.c.orig 2019-06-21 19:41:51.000000000 -0700
+++ ./attic/clocks.c 2019-07-02 11:55:05.000000000 -0700
+++ ./attic/clocks.c 2019-07-11 17:37:25.000000000 -0700
@@ -5,6 +5,8 @@
#include <stdio.h>
#include <time.h>
@@ -21,7 +21,7 @@
const int type;
const char* name;
--- ./attic/digest-timing.c.orig 2019-06-21 19:41:51.000000000 -0700
+++ ./attic/digest-timing.c 2019-07-02 11:55:05.000000000 -0700
+++ ./attic/digest-timing.c 2019-07-11 17:37:25.000000000 -0700
@@ -34,6 +34,8 @@
#include <openssl/rand.h>
#include <openssl/objects.h>
@@ -32,7 +32,7 @@

#ifndef EVP_MD_CTX_reset
--- ./include/ntp_machine.h.orig 2019-06-21 19:41:51.000000000 -0700
+++ ./include/ntp_machine.h 2019-07-02 11:55:05.000000000 -0700
+++ ./include/ntp_machine.h 2019-07-11 17:37:25.000000000 -0700
@@ -13,14 +13,135 @@

#ifndef CLOCK_REALTIME
@@ -176,7 +176,7 @@
int ntp_set_tod (struct timespec *tvs);

--- ./include/ntp_stdlib.h.orig 2019-06-21 19:41:51.000000000 -0700
+++ ./include/ntp_stdlib.h 2019-07-02 11:55:05.000000000 -0700
+++ ./include/ntp_stdlib.h 2019-07-11 17:37:25.000000000 -0700
@@ -95,7 +95,9 @@ extern const char * eventstr (int);
extern const char * ceventstr (int);
extern const char * res_match_flags(unsigned short);
@@ -188,7 +188,7 @@
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
+++ ./include/ntp_syscall.h 2019-07-02 11:55:05.000000000 -0700
+++ ./include/ntp_syscall.h 2019-07-11 17:37:25.000000000 -0700
@@ -9,9 +9,11 @@
#ifndef GUARD_NTP_SYSCALL_H
#define GUARD_NTP_SYSCALL_H
@@ -202,7 +202,7 @@
/*
* The units of the maxerror and esterror fields vary by platform. If
--- ./libntp/clockwork.c.orig 2019-06-21 19:41:51.000000000 -0700
+++ ./libntp/clockwork.c 2019-07-02 11:55:05.000000000 -0700
+++ ./libntp/clockwork.c 2019-07-11 17:37:25.000000000 -0700
@@ -5,8 +5,10 @@
#include "config.h"

@@ -217,7 +217,7 @@
#include "ntp.h"
#include "ntp_machine.h"
--- ./libntp/statestr.c.orig 2019-06-21 19:41:51.000000000 -0700
+++ ./libntp/statestr.c 2019-07-02 11:55:05.000000000 -0700
+++ ./libntp/statestr.c 2019-07-11 17:37:25.000000000 -0700
@@ -12,7 +12,9 @@
#include "lib_strbuf.h"
#include "ntp_refclock.h"
@@ -318,8 +318,8 @@

/*
* statustoa - return a descriptive string for a peer status
--- ./ntpd/ntp_control.c.orig 2019-06-21 19:41:51.000000000 -0700
+++ ./ntpd/ntp_control.c 2019-07-02 11:55:05.000000000 -0700
--- ./ntpd/ntp_control.c.orig 2019-06-30 00:21:32.000000000 -0700
+++ ./ntpd/ntp_control.c 2019-07-11 17:37:25.000000000 -0700
@@ -1357,6 +1357,7 @@ ctl_putsys(
char str[256];
double dtemp;
@@ -443,7 +443,7 @@

case CS_K_PPS_FREQ:
--- ./ntpd/ntp_loopfilter.c.orig 2019-06-21 19:41:51.000000000 -0700
+++ ./ntpd/ntp_loopfilter.c 2019-07-02 11:55:05.000000000 -0700
+++ ./ntpd/ntp_loopfilter.c 2019-07-11 17:37:25.000000000 -0700
@@ -23,8 +23,10 @@

#define NTP_MAXFREQ 500e-6
@@ -680,7 +680,7 @@
-#endif /* SIGSYS */
+#endif /* HAVE_KERNEL_PLL && SIGSYS */
--- ./ntpd/ntp_timer.c.orig 2019-06-21 19:41:51.000000000 -0700
+++ ./ntpd/ntp_timer.c 2019-07-02 11:55:05.000000000 -0700
+++ ./ntpd/ntp_timer.c 2019-07-11 17:37:25.000000000 -0700
@@ -13,7 +13,9 @@
#include <signal.h>
#include <unistd.h>
@@ -704,7 +704,7 @@
leap_smear.enabled = (leap_smear_intv != 0);
#endif
--- ./ntpd/refclock_local.c.orig 2019-06-21 19:41:51.000000000 -0700
+++ ./ntpd/refclock_local.c 2019-07-02 11:55:05.000000000 -0700
+++ ./ntpd/refclock_local.c 2019-07-11 17:37:25.000000000 -0700
@@ -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.
@@ -728,7 +728,7 @@
refclock_receive(peer);
}
--- ./ntpfrob/precision.c.orig 2019-06-21 19:41:51.000000000 -0700
+++ ./ntpfrob/precision.c 2019-07-02 11:55:05.000000000 -0700
+++ ./ntpfrob/precision.c 2019-07-11 17:37:25.000000000 -0700
@@ -11,6 +11,7 @@
#include "ntp_types.h"
#include "ntp_calendar.h"
@@ -738,7 +738,7 @@
#define DEFAULT_SYS_PRECISION -99

--- ./tests/libntp/statestr.c.orig 2019-06-21 19:41:51.000000000 -0700
+++ ./tests/libntp/statestr.c 2019-07-02 11:55:05.000000000 -0700
+++ ./tests/libntp/statestr.c 2019-07-11 17:37:25.000000000 -0700
@@ -4,7 +4,9 @@
#include "unity.h"
#include "unity_fixture.h"
@@ -760,7 +760,7 @@

// statustoa
--- ./wafhelpers/bin_test.py.orig 2019-06-21 19:41:51.000000000 -0700
+++ ./wafhelpers/bin_test.py 2019-07-02 11:55:05.000000000 -0700
+++ ./wafhelpers/bin_test.py 2019-07-11 17:37:25.000000000 -0700
@@ -91,6 +91,12 @@ def cmd_bin_test(ctx, config):
for cmd in cmd_map3:
cmd_map2[cmd] = cmd_map3[cmd]
@@ -775,7 +775,7 @@
if not run(cmd, cmd_map[cmd], False):
fails += 1
--- ./wafhelpers/options.py.orig 2019-06-21 19:41:51.000000000 -0700
+++ ./wafhelpers/options.py 2019-07-02 11:55:05.000000000 -0700
+++ ./wafhelpers/options.py 2019-07-11 17:37:25.000000000 -0700
@@ -19,6 +19,8 @@ def options_cmd(ctx, config):
help="Droproot earlier (breaks SHM and NetBSD).")
grp.add_option('--enable-seccomp', action='store_true',
@@ -786,7 +786,7 @@
default=False, help="Disable MDNS registration.")
grp.add_option(
--- ./wscript.orig 2019-06-21 19:41:51.000000000 -0700
+++ ./wscript 2019-07-02 11:55:05.000000000 -0700
+++ ./wscript 2019-07-11 17:37:25.000000000 -0700
@@ -593,7 +593,7 @@ int main(int argc, char **argv) {
structures = (
("struct if_laddrconf", ["sys/types.h", "net/if6.h"], False),

0 comments on commit ad752b2

Please sign in to comment.
You can’t perform that action at this time.