CVS commit: pkgsrc/time/ntpsec

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sat Jul 30 01:22:07 UTC 2022

Modified Files:
        pkgsrc/time/ntpsec: Makefile PLIST distinfo
        pkgsrc/time/ntpsec/patches: patch-wscript

Log Message:
ntpsec: update to 1.2.1

2021-06-06: 1.2.1
Update ntpkeygen/keygone to properly filter # characters. (CVE-2021-22212)
Add dextral peers mode in ntpq and ntpmon.
Drop NTPv1 as the support was not RFC compliant, maybe v2 except mode 6 next.
Fix argument P for ntpd parsing fixed and ntpdate improvements.
Fix crash for raw ntpq readvar.
Add processor usage to NTS-KE logging except on NetBSD.
The build epoch has been replaced with a hardcoded timestamp which will be
manually updated every nine years or so (approx 512w).  This makes the
binaries reproducible by default.
Compare versions of ntp.ntpc and libntpc printing a warning if
mismatched. Fix libntpc install path if using it.
Reduce maxclocks default to 5 to reduce the NTP pool load.
Print LIBDIR during ./waf configure.
Add documentation, new GPG key, and other cleanups.

2020-10-06: 1.2.0
The minor version bump is to indicate official official support of
RFC8915 "Network Time Security for the Network Time Protocol" which
was released 2020-09-30.
NTS-KE client now defaults to port 4460.
NTS-KE server now listens on port 4460.
(Listening on port 123 has been removed.)
The shebang of installed Python scripts can now be customized with:
  waf configure --pyshebang="..."
NTP clients now use a shared library with Python instead of an extension.
Add flakiness option to ntpq and fixed limit=1 in mrulist.
Fixed a minor formatting issue in rate page.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/time/ntpsec/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/time/ntpsec/PLIST
cvs rdiff -u -r1.4 -r1.5 pkgsrc/time/ntpsec/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/time/ntpsec/patches/patch-wscript

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/time/ntpsec/Makefile
diff -u pkgsrc/time/ntpsec/Makefile:1.17 pkgsrc/time/ntpsec/Makefile:1.18
--- pkgsrc/time/ntpsec/Makefile:1.17    Sat Jul 30 00:00:57 2022
+++ pkgsrc/time/ntpsec/Makefile Sat Jul 30 01:22:07 2022
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2022/07/30 00:00:57 tnn Exp $
+# $NetBSD: Makefile,v 1.18 2022/07/30 01:22:07 tnn Exp $
 
-DISTNAME=      ntpsec-1.1.9
-PKGREVISION=   7
+DISTNAME=      ntpsec-1.2.1
 CATEGORIES=    time
 MASTER_SITES=  https://ftp.ntpsec.org/pub/releases/
 
@@ -17,6 +16,7 @@ BUILD_DEPENDS+=       waf-[0-9]*:../../devel/w
 
 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,
 # but I can't figure out how to pass it through waf, so disable precompiled
 # python files for now ...
@@ -27,7 +27,6 @@ WAF_ENV+=             BIN_A2X=${PREFIX}/bin/a2x
 WAF_ENV+=              BIN_XSLTPROC=${PREFIX}/bin/xsltproc
 
 RCD_SCRIPTS=           ntpd
-REPLACE_PYTHON+=       ntpclients/*.py
 PY_PATCHPLIST=         yes
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27

Index: pkgsrc/time/ntpsec/PLIST
diff -u pkgsrc/time/ntpsec/PLIST:1.3 pkgsrc/time/ntpsec/PLIST:1.4
--- pkgsrc/time/ntpsec/PLIST:1.3        Sat Aug 15 02:31:28 2020
+++ pkgsrc/time/ntpsec/PLIST    Sat Jul 30 01:22:07 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2020/08/15 02:31:28 tnn Exp $
+@comment $NetBSD: PLIST,v 1.4 2022/07/30 01:22:07 tnn Exp $
 bin/ntpdig
 bin/ntpfrob
 bin/ntpkeygen
@@ -13,13 +13,16 @@ bin/ntptime
 bin/ntptrace
 bin/ntpviz
 bin/ntpwait
+lib/libntpc.so
+lib/libntpc.so.1
+lib/libntpc.so.1.1.0
 ${PYSITELIB}/ntp-${PKGVERSION}.egg-info
 ${PYSITELIB}/ntp/__init__.py
 ${PYSITELIB}/ntp/agentx.py
 ${PYSITELIB}/ntp/agentx_packet.py
 ${PYSITELIB}/ntp/control.py
 ${PYSITELIB}/ntp/magic.py
-${PYSITELIB}/ntp/ntpc.so
+${PYSITELIB}/ntp/ntpc.py
 ${PYSITELIB}/ntp/packet.py
 ${PYSITELIB}/ntp/poly.py
 ${PYSITELIB}/ntp/statfiles.py

Index: pkgsrc/time/ntpsec/distinfo
diff -u pkgsrc/time/ntpsec/distinfo:1.4 pkgsrc/time/ntpsec/distinfo:1.5
--- pkgsrc/time/ntpsec/distinfo:1.4     Tue Oct 26 11:24:23 2021
+++ pkgsrc/time/ntpsec/distinfo Sat Jul 30 01:22:07 2022
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2021/10/26 11:24:23 nia Exp $
+$NetBSD: distinfo,v 1.5 2022/07/30 01:22:07 tnn Exp $
 
-BLAKE2s (ntpsec-1.1.9.tar.gz) = 82b991764abdedb11db052b79dd4baca0168d5eb3f7016f822f91f4cc5a9f704
-SHA512 (ntpsec-1.1.9.tar.gz) = e04267aa675a5b528f3478d00329a569ecb9bbe2b6ad18697020854d2ee451bc188c4603cd5f420a08a7e3bf047d2db1301416f57f9156df23aceb1f57303b0b
-Size (ntpsec-1.1.9.tar.gz) = 2606066 bytes
-SHA1 (patch-wscript) = f34ff4f2f13d559651e5c302a0d792f53d458933
+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

Index: pkgsrc/time/ntpsec/patches/patch-wscript
diff -u pkgsrc/time/ntpsec/patches/patch-wscript:1.2 pkgsrc/time/ntpsec/patches/patch-wscript:1.3
--- pkgsrc/time/ntpsec/patches/patch-wscript:1.2        Sat Aug 15 02:31:28 2020
+++ pkgsrc/time/ntpsec/patches/patch-wscript    Sat Jul 30 01:22:07 2022
@@ -1,10 +1,10 @@
-$NetBSD: patch-wscript,v 1.2 2020/08/15 02:31:28 tnn Exp $
+$NetBSD: patch-wscript,v 1.3 2022/07/30 01:22:07 tnn Exp $
 
 - don't hardcode PREFIX
 
---- wscript.orig       2020-05-24 03:00:19.000000000 +0000
+--- wscript.orig       2021-06-07 04:03:11.000000000 +0000
 +++ wscript
-@@ -497,18 +497,10 @@ int main(int argc, char **argv) {
+@@ -507,25 +507,12 @@ int main(int argc, char **argv) {
  
      # XXX: hack
      if ctx.env.DEST_OS in ["freebsd"]:
@@ -16,6 +16,14 @@ $NetBSD: patch-wscript,v 1.2 2020/08/15 
 -        ctx.env.LIBPATH = ["/usr/pkg/lib"]
 -        ctx.env.LDFLAGS += ["-rpath=/usr/pkg/lib"]
 +        pass
+     elif ctx.env.DEST_OS == "linux" and os.path.isdir("/usr/local/ssl/"):
+-        # This supports building OpenSSL from source
+-        # That allows using OpenSSL 1.1.1 on older CentOS
+-        # or testing pre-release versions of OpenSSL
+-        # see HOWTO-OpenSSL
+-        ctx.env.INCLUDES = ["/usr/local/ssl/include"]
+-        ctx.env.LIBPATH = ["/usr/local/ssl/lib"]
++        pass
      elif ctx.env.DEST_OS == "darwin":
 -        # macports location
 -        if os.path.isdir("/opt/local/include"):