[Git][NTPsec/ntpsec][21D11-news] 8 commits: ubuntu-rolling needs gpgv explicitly installed in order to be able to verify packages
James Browning (@jamesb_fe80)
gitlab at mg.gitlab.com
Tue May 18 19:33:11 UTC 2021
James Browning pushed to branch 21D11-news at NTPsec / ntpsec
Commits:
7a940ebb by Matt Selsky at 2021-05-10T03:08:25+00:00
ubuntu-rolling needs gpgv explicitly installed in order to be able to verify packages
- - - - -
212a56e3 by Matt Selsky at 2021-05-10T03:32:39+00:00
We need gpgv before any updating can be done
- - - - -
fc50a701 by Eric S. Raymond at 2021-05-11T08:10:10-04:00
Don't generate # into ASCIIfied keys.
- - - - -
1a8e2da3 by James Browning at 2021-05-12T09:10:12-07:00
CI: apply gitlab-runner #27614 fix, mostly addresses #687 r3 ...
Fix two and attempt third of fedora:latest runners
restore opensuse:tumbleweed, ubuntu:devel
fix an ubuntu:rolling job, the other is key related
- - - - -
4fd93e49 by James Browning at 2021-05-13T12:15:12-07:00
contrib: fix unlikely comment initiator in keygone.py
- - - - -
0d0ac7a9 by James Browning at 2021-05-13T12:15:12-07:00
docs: remove -M from keygen options mention
- - - - -
c769a19d by James Browning at 2021-05-13T12:38:35-07:00
docs: replace old sx5.gif with newer one w/o background
- - - - -
967a1bee by James Browning at 2021-05-18T19:32:56+00:00
NEWS: add entries and grammar lint. 21E-May17
- - - - -
8 changed files:
- .dockerfiles/ubuntu-rolling
- .gitlab-ci.yml
- .gitlab-opttest-ci.yml
- NEWS.adoc
- contrib/keygone.py
- docs/includes/ntpkeygen-body.adoc
- docs/pic/sx5.gif
- ntpclients/ntpkeygen.py
Changes:
=====================================
.dockerfiles/ubuntu-rolling
=====================================
@@ -1,4 +1,5 @@
FROM ubuntu:rolling
+RUN apt install gpgv
RUN apt-get update
RUN apt-get install -y netbase bison gcc libssl-dev libcap-dev pps-tools python3-dev libbsd-dev
=====================================
.gitlab-ci.yml
=====================================
@@ -66,7 +66,9 @@ alpine-edge-refclocks:
AsciiDoc-3-Fedora:
<<: *job_definition_allow_failure
- image: fedora
+ image:
+ name: fedora
+ entrypoint: [ '/bin/bash', '-c' ]
script:
- yum -y install bison gcc openssl-devel libcap-devel pps-tools-devel python3-devel wget unzip libxslt docbook-style-xsl
- wget https://asciidoc3.org/asciidoc3-3.2.0.zip
@@ -176,6 +178,24 @@ ubuntu-latest-refclocks:
script:
- python3 ./waf configure --disable-doc --disable-manpage --refclock=all build
+ubuntu-devel-basic:
+ <<: *job_definition_allow_failure
+ image:
+ name: $CI_REGISTRY/ntpsec/ntpsec/ubuntu-devel
+ entrypoint: [ '/bin/bash', '-c', 'ln -snf /bin/bash /bin/sh && /bin/bash -c $0' ]
+ script:
+ - python3 ./waf configure --disable-doc --disable-manpage build --pyshebang "/usr/bin/env python3"
+ - python3 ./waf install
+ - python3 ./waf uninstall
+
+ubuntu-devel-refclocks:
+ <<: *job_definition_allow_failure
+ image:
+ name: $CI_REGISTRY/ntpsec/ntpsec/ubuntu-devel
+ entrypoint: [ '/bin/bash', '-c', 'ln -snf /bin/bash /bin/sh && /bin/bash -c $0' ]
+ script:
+ - python3 ./waf configure --disable-doc --disable-manpage --refclock=all build
+
ubuntu-rolling-basic:
<<: *job_definition
image: $CI_REGISTRY/ntpsec/ntpsec/ubuntu-rolling
@@ -250,7 +270,9 @@ centos-latest-refclocks:
fedora-latest-basic:
<<: *job_definition
- image: $CI_REGISTRY/ntpsec/ntpsec/fedora-latest
+ image:
+ name: $CI_REGISTRY/ntpsec/ntpsec/fedora-latest
+ entrypoint: [ '/bin/bash', '-c' ]
script:
- python3 ./waf configure --disable-doc --disable-manpage build --pyshebang "/usr/bin/env python3"
- python3 ./waf install
@@ -258,7 +280,9 @@ fedora-latest-basic:
fedora-latest-refclocks:
<<: *job_definition
- image: $CI_REGISTRY/ntpsec/ntpsec/fedora-latest
+ image:
+ name: $CI_REGISTRY/ntpsec/ntpsec/fedora-latest
+ entrypoint: [ '/bin/bash', '-c' ]
script:
- python3 ./waf configure --disable-doc --disable-manpage --refclock=all build
@@ -304,6 +328,24 @@ openSUSE-leap-refclocks:
script:
- python3 ./waf configure --disable-doc --disable-manpage --disable-nts --refclock=all build
+openSUSE-tumbleweed-basic:
+ <<: *job_definition_allow_failure
+ image:
+ name: $CI_REGISTRY/ntpsec/ntpsec/opensuse-tumbleweed
+ entrypoint: [ '/bin/bash', '-c' ]
+ script:
+ - python3 ./waf configure --disable-doc --disable-manpage build --pyshebang "/usr/bin/env python3"
+ - python3 ./waf install
+ - python3 ./waf uninstall
+
+openSUSE-tumbleweed-refclocks:
+ <<: *job_definition_allow_failure
+ image:
+ name: $CI_REGISTRY/ntpsec/ntpsec/opensuse-tumbleweed
+ entrypoint: [ '/bin/bash', '-c' ]
+ script:
+ - python3 ./waf configure --disable-doc --disable-manpage --refclock=all build
+
debian-stable-basic-32bit:
<<: *job_definition
image: $CI_REGISTRY/ntpsec/ntpsec/debian-stable-i386
=====================================
.gitlab-opttest-ci.yml
=====================================
@@ -28,7 +28,9 @@ centos-options-tester:
- dnf -y --enablerepo=powertools install bison gcc openssl-devel libcap-devel python3-devel python2-devel pps-tools-devel libseccomp-devel bash
fedora-latest-options-tester:
- image: fedora:latest
+ image:
+ name: fedora:latest
+ entrypoint: [ '/bin/bash', '-c', 'ln -snf /bin/bash /bin/sh && /bin/bash -c $0' ]
script:
- yum -y install bison gcc openssl-devel libcap-devel pps-tools-devel python3-devel python2-devel libseccomp-devel bash
<<: *option_tester
@@ -141,6 +143,14 @@ ubuntu-latest-options-tester:
image: ubuntu:latest
<<: *deb_option_tester
+ubuntu-devel-options-tester:
+ image:
+ name: ubuntu:devel
+ entrypoint: [ '/bin/sh', '-c', 'ln -snf /bin/bash /bin/sh && /bin/bash -c $0']
+ <<: *deb_option_tester
+
ubuntu-rolling-options-tester:
- image: ubuntu:rolling
+ image:
+ name: ubuntu:rolling
+ entrypoint: [ '/bin/sh', '-c', 'ln -snf /bin/bash /bin/sh && /bin/bash -c $0']
<<: *deb_option_tester
=====================================
NEWS.adoc
=====================================
@@ -12,6 +12,20 @@ on user-visible changes.
== Repository Head ==
+Update ntpkeygen, keygone and docs to reflect updated keyfile issues.
+
+Print protostats since start of execution for 'ntpq -c sysstats'
+
+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.
+
Remove --build-epoch and replace it with arbitrary --build-desc text.
Passing '--build-desc=$(date -u +%Y-%m-%dT%H:%M:%Sz)' restores the previous
default extended version.
@@ -20,14 +34,14 @@ 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 is
+Compare versions of ntp.ntpc and libntpc printing a warning if
mismatched. Fix libntpc install path if using it.
-Reduce maxclocks to 5 to reduce the NTP pool load.
+Reduce maxclocks default to 5 to reduce the NTP pool load.
Print LIBDIR during ./waf configure.
-Documentation, new GPG key, and miscellaneous cleanups.
+Add documentation, new GPG key, and other cleanups.
== 2020-10-06: 1.2.0 ==
=====================================
contrib/keygone.py
=====================================
@@ -106,7 +106,7 @@ class KeyGone():
return secrets.token_hex(length)
result = ''
for _ in range(length):
- result += chr(0x21 + secrets.randbelow(0x5d))
+ result += chr(0x24 + secrets.randbelow(0x5a))
return result
=====================================
docs/includes/ntpkeygen-body.adoc
=====================================
@@ -4,7 +4,7 @@
== Synopsis
[verse]
-+ntpkeygen+ [+-MV+]
++ntpkeygen+ [+-V+]
== Description
=====================================
docs/pic/sx5.gif
=====================================
Binary files a/docs/pic/sx5.gif and b/docs/pic/sx5.gif differ
=====================================
ntpclients/ntpkeygen.py
=====================================
@@ -33,7 +33,8 @@ try:
if asciified:
result = ''
for index in range(bytes):
- result += chr(0x21 + secrets.randbelow(0x5d))
+ # Start ASCII characters with 0x24 so as not to include comment-beginning #
+ result += chr(0x24 + secrets.randbelow(0x5a))
return result
else:
return secrets.token_hex(bytes)
@@ -43,7 +44,8 @@ except ImportError:
result = ''
if asciified:
for index in range(bytes):
- result += chr(random.randint(0x21, 0x7e))
+ # Start ASCII characters with 0x24 so as not to include comment-beginning #
+ result += chr(random.randint(0x24, 0x7e))
else:
for index in range(bytes):
result += "%02x" % random.randint(0x0, 0xff)
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/-/compare/63b7ce46fb8aa607b54b6faa0e7e893980b3dbe5...967a1beedca23922ee6fbfb705609efab50b42e3
--
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/-/compare/63b7ce46fb8aa607b54b6faa0e7e893980b3dbe5...967a1beedca23922ee6fbfb705609efab50b42e3
You're receiving this email because of your account on gitlab.com.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ntpsec.org/pipermail/vc/attachments/20210518/2b34c2ba/attachment-0001.htm>
More information about the vc
mailing list