ntpsec: updated to 1.2.3

1.2.3

* Change mode6 alignment to four, which may
  break some compatibility with classic NTP.
* Seccomp should now also yield invalid syscall names when dying.
* Make ntpq stop dropping output timestamp leading zeroes.
* Update documents in quite a few places.
* Reset some stats hourly, even when not logged into files.
* Add error logging, and stats for ms-sntp.
* Add spacing between multiple peer views in ntpq.
* We think we have fixed ms-sntp but we can't test it.
  If you can test it, please let us know if it does/doesn't work.
* ntpd and ntpq both treat SHA-1 as an alias for SHA1
  NIST uses SHA-1.  The crypto package from OpenSSL uses SHA1.
* The default crypto type for ntpq is now AES.
  RFC 8573 deprecated MD5.
* There are now log files with hourly statistics for NTS and
  NTS-KE traffic: filegen ntsstats and filegen ntskestats,
* Update ntpsnmpd to use python built-in to get uname information.
* Update license file names for REUSE compliance.
* Fix ntploggps issue where count_used_satellites checked before it is initialized.
* Print out OpenSSL version at configure time.
* Enable debug symbols by default, with only an option to disable.
* Add support for ecdhcurves list.
* Fix build on platforms where `-fstack-protector` relies on libssp, like musl.
* Fix ntpdig crash when using 2.ntp.pool.org with a host without IPv6 support.
* Do not install libaes_siv test anymore.
* Add update option to buildprep.
* ntpdig shows packet delay in JSON output.

time/ntpsec/Makefile

@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.28 2023/11/08 13:21:13 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2024/01/13 12:08:17 adam Exp $
 
-DISTNAME=	ntpsec-1.2.1
-PKGREVISION=	7
+DISTNAME=	ntpsec-1.2.3
 CATEGORIES=	time
 MASTER_SITES=	https://ftp.ntpsec.org/pub/releases/
 
@@ -14,6 +13,7 @@ TOOL_DEPENDS+=	asciidoc-[0-9]*:../../textproc/asciidoc
 TOOL_DEPENDS+=	waf-[0-9]*:../../devel/waf
 
 USE_TOOLS+=		bison m4 pkg-config
+
 WAF_CONFIGURE_ARGS+=	--python=${PYTHONBIN}
 WAF_CONFIGURE_ARGS+=	--pyshebang=${PYTHONBIN}
 # pkgsrc python PLIST logic expects all python-3.x extensions to use -O1,
@@ -21,9 +21,11 @@ WAF_CONFIGURE_ARGS+=	--pyshebang=${PYTHONBIN}
 # python files for now ...
 WAF_CONFIGURE_ARGS+=	--nopyc --nopyo
 WAF_CONFIGURE_ARGS+=	--refclock=all
-WAF_ENV+=		PYTHON_CONFIG=${PYTHONCONFIG}
-WAF_ENV+=		BIN_A2X=${PREFIX}/bin/a2x
-WAF_ENV+=		BIN_XSLTPROC=${PREFIX}/bin/xsltproc
+WAF_REPLACE_EXECUTABLE=	yes
+
+WAF_ENV+=	BIN_A2X=${PREFIX}/bin/a2x
+WAF_ENV+=	BIN_XSLTPROC=${PREFIX}/bin/xsltproc
+WAF_ENV+=	PYTHON_CONFIG=${PYTHONCONFIG}
 
 RCD_SCRIPTS=		ntpd
 PY_PATCHPLIST=		yes

time/ntpsec/distinfo

@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2022/07/30 01:22:07 tnn Exp $
+$NetBSD: distinfo,v 1.6 2024/01/13 12:08:18 adam Exp $
 
-BLAKE2s (ntpsec-1.2.1.tar.gz) = 9173c05feff5df11bc52426e085051f5bf647703148767bfe2a64c97e709d624
-SHA512 (ntpsec-1.2.1.tar.gz) = 0b8b0bda52d3025f6e9a06c00b1e0c25c595ada72b87ed0e5d3d6f77a034f557745156bc6d9a263c9876c041efffa38d42fa93ba8bfda31f67efbd842a726277
-Size (ntpsec-1.2.1.tar.gz) = 2681237 bytes
-SHA1 (patch-wscript) = 056dd6f99df7a66c6d59a9f483b4dd4d8d55d61c
+BLAKE2s (ntpsec-1.2.3.tar.gz) = 09dd25ab6433f5bf8771fb05e8fbe423451d632f9764825dc104c04d353d51fa
+SHA512 (ntpsec-1.2.3.tar.gz) = 6baecf32f499fc12c2ef0b44360072b61ab9e8b52ec7ead64ff43a27b5a57431db939d4ce1fad92d38def981f6256a1d8ede0c0cdc5abb50d861be729255eee2
+Size (ntpsec-1.2.3.tar.gz) = 2725081 bytes
+SHA1 (patch-wscript) = c1119e5f5697655ef9a3cc27386837b3c213aafe

time/ntpsec/patches/patch-wscript

@@ -1,20 +1,28 @@
-$NetBSD: patch-wscript,v 1.3 2022/07/30 01:22:07 tnn Exp $
+$NetBSD: patch-wscript,v 1.4 2024/01/13 12:08:18 adam Exp $
 
-- don't hardcode PREFIX
+Don't hardcode PREFIX.
 
---- wscript.orig	2021-06-07 04:03:11.000000000 +0000
+--- wscript.orig	2023-12-29 04:53:56.000000000 +0000
 +++ wscript
-@@ -507,25 +507,12 @@ int main(int argc, char **argv) {
+@@ -521,36 +521,12 @@ int main(int argc, char **argv) {
  
      # XXX: hack
      if ctx.env.DEST_OS in ["freebsd"]:
 -        ctx.env.INCLUDES = ["/usr/local/include"]
 -        ctx.env.LIBPATH = ["/usr/local/lib"]
+-        if os.path.isdir("/usr/local/ssl/"):
+-          # This assumes OpenSSL is the only thing that was in /usr/local/
+-          ctx.env.INCLUDES = ["/usr/local/ssl/include"]
+-          ctx.env.LIBPATH = ["/usr/local/ssl/lib"]
 +        pass
      elif ctx.env.DEST_OS == "netbsd" and os.path.isdir("/usr/pkg/include"):
 -        ctx.env.INCLUDES = ["/usr/pkg/include"]
 -        ctx.env.LIBPATH = ["/usr/pkg/lib"]
 -        ctx.env.LDFLAGS += ["-rpath=/usr/pkg/lib"]
+-        if os.path.isdir("/usr/local/ssl/"):
+-          # This assumes OpenSSL is the only thing that was in /usr/pkg/
+-          ctx.env.INCLUDES = ["/usr/local/ssl/include"]
+-          ctx.env.LIBPATH = ["/usr/local/ssl/lib"]
 +        pass
      elif ctx.env.DEST_OS == "linux" and os.path.isdir("/usr/local/ssl/"):
 -        # This supports building OpenSSL from source
@@ -22,7 +30,10 @@ $NetBSD: patch-wscript,v 1.3 2022/07/30 01:22:07 tnn Exp $
 -        # or testing pre-release versions of OpenSSL
 -        # see HOWTO-OpenSSL
 -        ctx.env.INCLUDES = ["/usr/local/ssl/include"]
--        ctx.env.LIBPATH = ["/usr/local/ssl/lib"]
+-        if os.path.isdir("/usr/local/ssl/lib64/"):
+-          ctx.env.LIBPATH = ["/usr/local/ssl/lib64"]
+-        else:
+-          ctx.env.LIBPATH = ["/usr/local/ssl/lib"]
 +        pass
      elif ctx.env.DEST_OS == "darwin":
 -        # macports location