ntpsec - update from 1.2.2 to 1.2.3

Author: citrus-it

build/ntpsec/build.sh

@@ -12,12 +12,12 @@
 # http://www.illumos.org/license/CDDL.
 # }}}
 
-# Copyright 2023 OmniOS Community Edition (OmniOSce) Association.
+# Copyright 2024 OmniOS Community Edition (OmniOSce) Association.
 
 . ../../lib/build.sh
 
 PROG=ntpsec
-VER=1.2.2
+VER=1.2.3
 PKG=service/network/ntpsec
 SUMMARY="Network time services"
 DESC="A secure, hardened and improved Network Time Protocol implementation"
@@ -47,7 +47,6 @@ CONFIGURE_OPTS="
     --libdir=$PYTHONVENDOR/ntp
     --enable-manpage --disable-doc
     --nopyc --nopyo --nopycache
-    --enable-debug-gdb
 "
 CONFIGURE_OPTS[WS]="
     --build-desc=\"$DISTRO $RELVER\"

build/ntpsec/local.mog

@@ -8,13 +8,17 @@
 # source. A copy of the CDDL is also available via the Internet at
 # http://www.illumos.org/license/CDDL.
 
-# Copyright 2022 OmniOS Community Edition (OmniOSce) Association.
-
-license LICENSES/BSD-2 license=simplified-BSD
-license LICENSES/BSD-3 license=modified-BSD
-license LICENSES/MIT license=MIT
-license LICENSES/CC-BY-4.0 license=skipCC
-license LICENSES/NTP license=skipNTP
+# Copyright 2024 OmniOS Community Edition (OmniOSce) Association.
+
+license LICENSES/Apache-2.0.txt license=Apache2
+license LICENSES/BSD-2-Clause.txt license=simplified-BSD
+license LICENSES/BSD-3-Clause.txt license=modified-BSD
+license LICENSES/BSD-4-Clause.txt license=modified-BSD
+license LICENSES/ISC.txt license=ISC
+license LICENSES/MIT.txt license=MIT
+license LICENSES/Beerware.txt license=skip/beerware
+license LICENSES/CC-BY-4.0.txt license=skip/CC
+license LICENSES/NTP.txt license=skip/NTP
 
 # Skip dependency detection for python programs that break the dependency
 # checker - more investigation required here.

build/ntpsec/patches/asciidoc.patch

@@ -1,4 +1,4 @@
-diff -wpruN '--exclude=*.orig' a~/wafhelpers/asciidoc.py a/wafhelpers/asciidoc.py
+diff -wpruN --no-dereference '--exclude=*.orig' a~/wafhelpers/asciidoc.py a/wafhelpers/asciidoc.py
 --- a~/wafhelpers/asciidoc.py	1970-01-01 00:00:00
 +++ a/wafhelpers/asciidoc.py	1970-01-01 00:00:00
 @@ -37,8 +37,7 @@ def configure(ctx):

build/ntpsec/patches/clockwork.patch

@@ -0,0 +1,13 @@
+diff -wpruN --no-dereference '--exclude=*.orig' a~/libntp/clockwork.c a/libntp/clockwork.c
+--- a~/libntp/clockwork.c	1970-01-01 00:00:00
++++ a/libntp/clockwork.c	1970-01-01 00:00:00
+@@ -39,8 +39,8 @@
+  */
+ int ntp_adjtime_ns(struct timex *ntx)
+ {
+-#ifdef STA_NANO
+ 	static bool nanoseconds = false;
++#ifdef STA_NANO
+ 	static bool initial_call = true;
+ 	if (initial_call)
+ 	{

build/ntpsec/patches/conf.patch

@@ -1,7 +1,7 @@
 
 Re-locate the default configuration file from /etc/ to /etc/inet/
 
-diff -wpruN '--exclude=*.orig' a~/docs/includes/ntp-conf-body.adoc a/docs/includes/ntp-conf-body.adoc
+diff -wpruN --no-dereference '--exclude=*.orig' a~/docs/includes/ntp-conf-body.adoc a/docs/includes/ntp-conf-body.adoc
 --- a~/docs/includes/ntp-conf-body.adoc	1970-01-01 00:00:00
 +++ a/docs/includes/ntp-conf-body.adoc	1970-01-01 00:00:00
 @@ -3,14 +3,14 @@
@@ -30,7 +30,7 @@ diff -wpruN '--exclude=*.orig' a~/docs/includes/ntp-conf-body.adoc a/docs/includ
    the default name of the configuration file
  `ntp.keys`::
    private keys
-diff -wpruN '--exclude=*.orig' a~/docs/ntpsec.adoc a/docs/ntpsec.adoc
+diff -wpruN --no-dereference '--exclude=*.orig' a~/docs/ntpsec.adoc a/docs/ntpsec.adoc
 --- a~/docs/ntpsec.adoc	1970-01-01 00:00:00
 +++ a/docs/ntpsec.adoc	1970-01-01 00:00:00
 @@ -213,7 +213,7 @@ to the security-critical core.
@@ -55,7 +55,7 @@ diff -wpruN '--exclude=*.orig' a~/docs/ntpsec.adoc a/docs/ntpsec.adoc
    more configuration declarations. Only files with the extension
    ".conf" are interpreted; others are ignored.  This feature is
    intended to make assembling configuration easier for administration
-diff -wpruN '--exclude=*.orig' a~/include/ntp_config.h a/include/ntp_config.h
+diff -wpruN --no-dereference '--exclude=*.orig' a~/include/ntp_config.h a/include/ntp_config.h
 --- a~/include/ntp_config.h	1970-01-01 00:00:00
 +++ a/include/ntp_config.h	1970-01-01 00:00:00
 @@ -18,7 +18,7 @@
@@ -67,7 +67,7 @@ diff -wpruN '--exclude=*.orig' a~/include/ntp_config.h a/include/ntp_config.h
  #endif /* not CONFIG_FILE */
  #define CONFIG_DIR	"ntp.d"
 
-diff -wpruN '--exclude=*.orig' a~/ntpclients/ntpleapfetch a/ntpclients/ntpleapfetch
+diff -wpruN --no-dereference '--exclude=*.orig' a~/ntpclients/ntpleapfetch a/ntpclients/ntpleapfetch
 --- a~/ntpclients/ntpleapfetch	1970-01-01 00:00:00
 +++ a/ntpclients/ntpleapfetch	1970-01-01 00:00:00
 @@ -28,7 +28,7 @@ MAXTRIES=6
@@ -79,10 +79,10 @@ diff -wpruN '--exclude=*.orig' a~/ntpclients/ntpleapfetch a/ntpclients/ntpleapfe
 
  # How long before expiration to get updated file
  PREFETCH="60 days"
-diff -wpruN '--exclude=*.orig' a~/pylib/packet.py a/pylib/packet.py
+diff -wpruN --no-dereference '--exclude=*.orig' a~/pylib/packet.py a/pylib/packet.py
 --- a~/pylib/packet.py	1970-01-01 00:00:00
 +++ a/pylib/packet.py	1970-01-01 00:00:00
-@@ -1728,7 +1728,7 @@ class Authenticator:
+@@ -1723,7 +1723,7 @@ class Authenticator:
                  return (keyid,) + self.passwords[keyid]
              else:
                  return (keyid, None, None)

build/ntpsec/patches/nonet.patch

@@ -1,7 +1,7 @@
 Always pass --nonet to xsltproc to avoid it checking for updated
 stylesheets.
 
-diff -wpruN '--exclude=*.orig' a~/wafhelpers/asciidoc.py a/wafhelpers/asciidoc.py
+diff -wpruN --no-dereference '--exclude=*.orig' a~/wafhelpers/asciidoc.py a/wafhelpers/asciidoc.py
 --- a~/wafhelpers/asciidoc.py	1970-01-01 00:00:00
 +++ a/wafhelpers/asciidoc.py	1970-01-01 00:00:00
 @@ -120,6 +120,7 @@ def configure(ctx):

build/ntpsec/patches/pie.patch

@@ -2,12 +2,12 @@
 Support for position independent executable is detected but then GCC fails
 to link the NTP daemon. Disable the PIE test for now.
 
-diff -wpruN '--exclude=*.orig' a~/wscript a/wscript
+diff -wpruN --no-dereference '--exclude=*.orig' a~/wscript a/wscript
 --- a~/wscript	1970-01-01 00:00:00
 +++ a/wscript	1970-01-01 00:00:00
-@@ -300,7 +300,7 @@ def configure(ctx):
+@@ -299,7 +299,7 @@ def configure(ctx):
+ 
      cc_test_flags = [
-         ('f_stack_protector_all', '-fstack-protector-all'),
          ('PIC', '-fPIC'),
 -        ('PIE', '-pie -fPIE'),
 +        #('PIE', '-pie -fPIE'),

build/ntpsec/patches/series

@@ -3,3 +3,4 @@ conf.patch
 nonet.patch
 unneeded_libs.patch
 asciidoc.patch
+clockwork.patch

build/ntpsec/patches/unneeded_libs.patch

@@ -1,4 +1,4 @@
-diff -wpruN '--exclude=*.orig' a~/wscript a/wscript
+diff -wpruN --no-dereference '--exclude=*.orig' a~/wscript a/wscript
 --- a~/wscript	1970-01-01 00:00:00
 +++ a/wscript	1970-01-01 00:00:00
 @@ -276,8 +276,8 @@ def configure(ctx):
@@ -29,5 +29,5 @@ diff -wpruN '--exclude=*.orig' a~/wscript a/wscript
 -        ctx.env.LDFLAGS += ["-lssp_nonshared"]
 -
      cc_test_flags = [
-         ('f_stack_protector_all', '-fstack-protector-all'),
          ('PIC', '-fPIC'),
+         #('PIE', '-pie -fPIE'),

build/ntpsec/testsuite.log

@@ -335,11 +335,13 @@ TEST(macencrypt, Encrypt) PASS
 TEST(macencrypt, DecryptValid) PASS
 TEST(macencrypt, DecryptInvalid) PASS
 TEST(macencrypt, CMAC_Encrypt) PASS
+TEST(macencrypt, CMAC_Encrypt) PASS
 TEST(macencrypt, DecryptValidCMAC) PASS
 TEST(macencrypt, DecryptInvalidCMAC) PASS
 TEST(macencrypt, IPv4AddressToRefId) PASS
 TEST(macencrypt, IPv6AddressToRefId) PASS
 TEST(macencrypt, null_trunc) PASS
+TEST(macencrypt, CMAC_TestVectors) PASS
 TEST(numtoa, RefidStr) PASS
 TEST(prettydate, ConstantDate) PASS
 TEST(prettydate, Rfc3339Date1) PASS
@@ -361,13 +363,6 @@ TEST(statestr, PeerRestart) PASS
 TEST(statestr, SysUnspecified) PASS
 TEST(statestr, ClockCodeExists) PASS
 TEST(statestr, ClockCodeUnknown) PASS
-TEST(strtolfp, PositiveInteger) PASS
-TEST(strtolfp, NegativeInteger) PASS
-TEST(strtolfp, PositiveFraction) PASS
-TEST(strtolfp, NegativeFraction) PASS
-TEST(strtolfp, PositiveMsFraction) PASS
-TEST(strtolfp, NegativeMsFraction) PASS
-TEST(strtolfp, InvalidChars) PASS
 TEST(timespecops, Helpers1) PASS
 TEST(timespecops, Normalise) PASS
 TEST(timespecops, SignNoFrac) PASS
@@ -411,7 +406,7 @@ TEST(ymd2yd, LeapYearFebruary) PASS
 TEST(ymd2yd, LeapYearDecember) PASS
 
 -----------------------
-155 Tests 0 Failures 0 Ignored 
+150 Tests 0 Failures 0 Ignored 
 OK
 
 *** stderr ***
@@ -493,9 +488,9 @@ RETURN VALUE: 0
 *** stdout ***
 
 *** stderr ***
-...
+....
 ----------------------------------------------------------------------
-Ran 3 tests
+Ran 4 tests
 
 OK