<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/c24a5ef4885ea91db45efe663369e9c4e2f6da98">https://github.com/macports/macports-ports/commit/c24a5ef4885ea91db45efe663369e9c4e2f6da98</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 c24a5ef4885 ntpsec: update to 1.2.2a, fixing crash bug
</span>c24a5ef4885 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c24a5ef4885ea91db45efe663369e9c4e2f6da98
</span>Author: Fred Wright <fw@fwright.net>
AuthorDate: Wed Aug 9 22:06:03 2023 -0700
<span style='display:block; white-space:pre;color:#404040;'> ntpsec: update to 1.2.2a, fixing crash bug
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This release is a focused update to 1.2.2, addressing an issue related
</span><span style='display:block; white-space:pre;color:#404040;'> to (but not quite the same as):
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> https://gitlab.com/NTPsec/ntpsec/-/issues/794
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also fixes the livecheck for patch updates (like this one), by
</span><span style='display:block; white-space:pre;color:#404040;'> allowing an optional single letter after the version number.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> As usual, this includes the patches for compatibility with
</span><span style='display:block; white-space:pre;color:#404040;'> macOS<10.13, 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_2a
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The patchfile is renormalized for the current mtimes, but not
</span><span style='display:block; white-space:pre;color:#404040;'> substantively changed.
</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, as is the
</span><span style='display:block; white-space:pre;color:#404040;'> untested 10.4 x86_64.
</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 with all variants on 10.4-10.5 ppc, 10.4-10.6
</span><span style='display:block; white-space:pre;color:#404040;'> i386, 10.6-10.15 x86_64, and 11.x-13.x arm64. Successful except where
</span><span style='display:block; white-space:pre;color:#404040;'> pythonXY was unavailable or broken on the OS/CPU combination.
</span>---
sysutils/ntpsec/Portfile | 13 +++++---
sysutils/ntpsec/files/patch-allfixes.diff | 52 +++++++++++++++----------------
2 files changed, 34 insertions(+), 31 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 8197609c754..dde72d4b7be 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.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.2.2a
</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 60b8c64a75d27d8e34db51c17050ccecc182f972 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 2f2848760b915dfe185b9217f777738b36ceeb78a7fc208b7e74e039dec22df5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 2710329
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 a00b6cddeb16087bd2c139340142519f68fefd5b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e0ce93af222a0a9860e6f5a51aadba9bb5ca601d80b2aea118a62f0a3226950e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2710790
</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;'>@@ -182,3 +182,6 @@ notes-append "Configuration is in ${prefix}/etc/ntp.conf."
</span> startupitem.create yes
startupitem.netchange yes
startupitem.executable ${prefix}/sbin/ntpd -n -g -p ${prefix}/var/run/ntpd.pid -f ${prefix}/var/db/ntp.drift -c ${prefix}/etc/ntp.conf
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Allow an optional letter after the version for patch releases
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex ${name}-(\\d+(?:\\.\\d+)*\\w+)
</span><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 decdc41a947..163d63cfc35 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> --- attic/backwards.c.orig 2022-12-22 22:08:52.000000000 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ attic/backwards.c 2022-12-30 00:59:15.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ attic/backwards.c 2023-08-09 00:16:14.000000000 -0700
</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 2022-12-22 22:08:52.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ attic/clocks.c 2022-12-30 00:59:15.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- attic/clocks.c.orig 2023-08-02 21:19:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ attic/clocks.c 2023-08-09 00:16:14.000000000 -0700
</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 2022-12-22 22:08:52.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ attic/cmac-timing.c 2022-12-30 00:59:15.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- attic/cmac-timing.c.orig 2023-08-02 21:19:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ attic/cmac-timing.c 2023-08-09 00:16:14.000000000 -0700
</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 2022-12-22 22:08:52.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ attic/digest-timing.c 2022-12-30 00:59:15.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- attic/digest-timing.c.orig 2023-08-02 21:19:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ attic/digest-timing.c 2023-08-09 00:16:14.000000000 -0700
</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 2022-12-22 22:08:52.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ attic/random.c 2022-12-30 00:59:15.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- attic/random.c.orig 2023-08-02 21:19:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ attic/random.c 2023-08-09 00:16:14.000000000 -0700
</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;'>@@ -54,7 +54,7 @@
</span> #define BILLION 1000000000
#define HISTSIZE 2500
--- include/ntp_machine.h.orig 2022-12-22 22:08:52.000000000 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/ntp_machine.h 2022-12-30 00:59:15.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ include/ntp_machine.h 2023-08-09 00:16:14.000000000 -0700
</span> @@ -13,14 +13,145 @@
#ifndef CLOCK_REALTIME
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -208,7 +208,7 @@
</span> int ntp_set_tod (struct timespec *tvs);
--- include/ntp_stdlib.h.orig 2022-12-22 22:08:52.000000000 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/ntp_stdlib.h 2022-12-30 00:59:15.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ include/ntp_stdlib.h 2023-08-09 00:16:14.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;'>@@ -220,7 +220,7 @@
</span> extern const char * socktoa (const sockaddr_u *);
extern const char * socktoa_r (const sockaddr_u *sock, char *buf, size_t buflen);
--- include/ntp_syscall.h.orig 2022-12-22 22:08:52.000000000 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/ntp_syscall.h 2022-12-30 00:59:15.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ include/ntp_syscall.h 2023-08-09 00:16:14.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;'>@@ -234,7 +234,7 @@
</span> /*
* The units of the maxerror and esterror fields vary by platform. If
--- libntp/clockwork.c.orig 2022-12-22 22:08:52.000000000 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libntp/clockwork.c 2022-12-30 00:59:15.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libntp/clockwork.c 2023-08-09 00:16:14.000000000 -0700
</span> @@ -5,8 +5,10 @@
#include "config.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -249,7 +249,7 @@
</span> #include "ntp.h"
#include "ntp_machine.h"
--- libntp/statestr.c.orig 2022-12-22 22:08:52.000000000 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libntp/statestr.c 2022-12-30 00:59:15.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libntp/statestr.c 2023-08-09 00:16:14.000000000 -0700
</span> @@ -12,7 +12,9 @@
#include "lib_strbuf.h"
#include "ntp_refclock.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -350,8 +350,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 2022-12-22 22:08:52.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ntpd/ntp_control.c 2022-12-30 00:59:15.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ntpd/ntp_control.c.orig 2023-08-02 21:19:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ntpd/ntp_control.c 2023-08-09 00:16:14.000000000 -0700
</span> @@ -1388,6 +1388,7 @@ ctl_putsys(
char str[256];
double dtemp;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -476,7 +476,7 @@
</span> case CS_K_PPS_FREQ:
CTL_IF_KERNPPS(
--- ntpd/ntp_loopfilter.c.orig 2022-12-22 22:08:52.000000000 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ntpd/ntp_loopfilter.c 2022-12-30 00:59:15.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ntpd/ntp_loopfilter.c 2023-08-09 00:16:14.000000000 -0700
</span> @@ -23,8 +23,10 @@
#define NTP_MAXFREQ 500e-6
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -699,7 +699,7 @@
</span> }
-
--- ntpd/ntp_timer.c.orig 2022-12-22 22:08:52.000000000 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ntpd/ntp_timer.c 2022-12-30 00:59:15.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ntpd/ntp_timer.c 2023-08-09 00:16:14.000000000 -0700
</span> @@ -13,7 +13,9 @@
#include <signal.h>
#include <unistd.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -723,7 +723,7 @@
</span> leap_smear.enabled = (leap_smear_intv != 0);
#endif
--- ntpd/refclock_local.c.orig 2022-12-22 22:08:52.000000000 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ntpd/refclock_local.c 2022-12-30 00:59:15.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ntpd/refclock_local.c 2023-08-09 00:16:14.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;'>@@ -747,7 +747,7 @@
</span> refclock_receive(peer);
}
--- ntpfrob/precision.c.orig 2022-12-22 22:08:52.000000000 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ntpfrob/precision.c 2022-12-30 00:59:15.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ntpfrob/precision.c 2023-08-09 00:16:14.000000000 -0700
</span> @@ -11,6 +11,7 @@
#include "ntp_types.h"
#include "ntp_calendar.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -757,7 +757,7 @@
</span> #define DEFAULT_SYS_PRECISION -99
--- tests/libntp/statestr.c.orig 2022-12-22 22:08:52.000000000 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tests/libntp/statestr.c 2022-12-30 00:59:15.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tests/libntp/statestr.c 2023-08-09 00:16:14.000000000 -0700
</span> @@ -4,7 +4,9 @@
#include "unity.h"
#include "unity_fixture.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -779,7 +779,7 @@
</span>
// statustoa
--- wafhelpers/bin_test.py.orig 2022-12-22 22:08:52.000000000 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ wafhelpers/bin_test.py 2022-12-30 00:59:15.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ wafhelpers/bin_test.py 2023-08-09 00:16:14.000000000 -0700
</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 +793,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 2022-12-22 22:08:52.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ wafhelpers/options.py 2022-12-30 00:59:15.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- wafhelpers/options.py.orig 2023-08-02 21:19:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ wafhelpers/options.py 2023-08-09 00:16:14.000000000 -0700
</span> @@ -23,6 +23,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 +804,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 2022-12-22 22:08:52.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ wscript 2022-12-30 00:59:15.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- wscript.orig 2023-08-02 21:19:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ wscript 2023-08-09 00:16:14.000000000 -0700
</span> @@ -585,7 +585,7 @@ int main(int argc, char **argv) {
structures = (
("struct if_laddrconf", ["sys/types.h", "net/if6.h"], False),
</pre><pre style='margin:0'>
</pre>