community/ntpsec: upgrade to 1.1.9

2 files changed, 13 insertions, 416 deletions

diff --git a/community/ntpsec/APKBUILD b/community/ntpsec/APKBUILD
index 1c1ad01cb8..390ea9bee8 100644
--- a/community/ntpsec/APKBUILD
+++ b/community/ntpsec/APKBUILD
@@ -1,8 +1,7 @@
 # Contributor: tcely <ntpsec+aports@tcely.33mail.com>
 # Maintainer:
-_pkgname="ntpsec"
-pkgname="${_pkgname}"
-pkgver="1.1.8"
+pkgname=ntpsec
+pkgver=1.1.9
 pkgrel=0
 pkgdesc="NTP reference implementation, refactored for security"
 url="https://www.ntpsec.org/"
@@ -10,9 +9,8 @@ arch="all"
 license="BSD-2-Clause"
 depends="bash busybox python3 py3-gpsd"
 makedepends="python3-dev bison asciidoc openssl-dev linux-headers"
-subpackages="${pkgname}-doc"
-source="https://ftp.ntpsec.org/pub/releases/${_pkgname}-${pkgver}.tar.gz
-        python-to-python3.patch"
+subpackages="$pkgname-doc"
+source="https://ftp.ntpsec.org/pub/releases/ntpsec-$pkgver.tar.gz"
 
 # secfixes:
 #   1.1.3-r0:
@@ -21,6 +19,13 @@ source="https://ftp.ntpsec.org/pub/releases/${_pkgname}-${pkgver}.tar.gz
 #     - CVE-2019-6444
 #     - CVE-2019-6445
 
+prepare() {
+        default_prepare
+
+        ln -s /usr/bin/python3 python
+        export PATH="$PATH":.
+}
+
 build() {
         ./waf configure \
                 --prefix=/usr \
@@ -37,11 +42,7 @@ check() {
 }
 
 package() {
-        ./waf install --destdir="${pkgdir}"
+        ./waf install --destdir="$pkgdir"
 }
 
-gpg_signature_extensions="asc"
-gpgfingerprints="good:B482 3776 1A26 9022 2C99  5F44 5A22 E330 161C 3978"
-
-sha512sums="0920f25adf68f1b8ccd1734c5d61ba1c858cd86b342db7b5155dd9b58e538aa96aad3fd4058597f079ec3df63cb51d2900ac8e6d9c84d6f2bd4a3a22cc0c967c  ntpsec-1.1.8.tar.gz
-86287e90f0eac4b9d0aaa912f8ca70a7b8a10f135143d388a013af41d61af820bb27355c0117911b611f2d9d778be4ffdf67d34f8e4f007e43d63d866c92bef4  python-to-python3.patch"
+sha512sums="e04267aa675a5b528f3478d00329a569ecb9bbe2b6ad18697020854d2ee451bc188c4603cd5f420a08a7e3bf047d2db1301416f57f9156df23aceb1f57303b0b  ntpsec-1.1.9.tar.gz"
diff --git a/community/ntpsec/python-to-python3.patch b/community/ntpsec/python-to-python3.patch
deleted file mode 100644
index 46c202cfa4..0000000000
--- a/community/ntpsec/python-to-python3.patch
+++ /dev/null
@@ -1,404 +0,0 @@
-diff --git a/attic/calc_tickadj/calc_tickadj b/attic/calc_tickadj/calc_tickadj
-index c8fda06..df316e0 100755
---- a/attic/calc_tickadj/calc_tickadj
-+++ b/attic/calc_tickadj/calc_tickadj
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- #
- # drift of 104.8576 -> +1 tick.  Base  of 10000 ticks.
- #
-diff --git a/buildprep b/buildprep
-index 9de9cb8..60fae56 100755
---- a/buildprep
-+++ b/buildprep
-@@ -54,7 +54,7 @@ done
- # Python 3 equivalents with a python3 prefix.  Compute the correct value for the
- # infix based on system Python.  This eill start to be significant after Python 2
- # EOLs at the beginning of 2020.
--PYVERS=`python --version 2>&1 | sed -n -e '/Python \([0-9]\).*/s//\1/p'`
-+PYVERS=`python3 --version 2>&1 | sed -n -e '/Python \([0-9]\).*/s//\1/p'`
- if [ "$PYVERS" = "2" ]
- then
-     PYVERS=""
-@@ -164,7 +164,7 @@ daemon () {
-     # Prerequisites to build the daemon: bison, pps-tools, service libraries
-     case $installer in
-        apk)
--           $install build-base python                  # basic tools
-+           $install build-base python${PYVERS}                  # basic tools
-            $install bison python${PYVERS}-dev linux-headers
-            $install openssl-dev libcap-dev libseccomp-dev
-            # probably needs more, but this builds
-diff --git a/contrib/cpu-temp-log b/contrib/cpu-temp-log
-index 340c4c8..be9896d 100755
---- a/contrib/cpu-temp-log
-+++ b/contrib/cpu-temp-log
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # coding: utf-8
- """\
- Usage: cpu-temper-log
-diff --git a/contrib/make-leap-seconds.py b/contrib/make-leap-seconds.py
-index 89fb475..a5b3837 100755
---- a/contrib/make-leap-seconds.py
-+++ b/contrib/make-leap-seconds.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- """\
- make-leap-seconds.py - make leap second file for testing
- 
-diff --git a/contrib/ntpconfigtest b/contrib/ntpconfigtest
-index 6f76150..e494a78 100755
---- a/contrib/ntpconfigtest
-+++ b/contrib/ntpconfigtest
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- 
- # On Linux systems, read /proc/config.gz and check for the
- # needed kernel options.
-diff --git a/contrib/ntpheat b/contrib/ntpheat
-index 36f5d06..285c5e4 100755
---- a/contrib/ntpheat
-+++ b/contrib/ntpheat
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- #
- # generate some heat!
- #
-diff --git a/contrib/ntpheatusb b/contrib/ntpheatusb
-index 496047e..6011258 100755
---- a/contrib/ntpheatusb
-+++ b/contrib/ntpheatusb
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- #
- # generate some heat!
- #
-diff --git a/contrib/smartctl-temp-log b/contrib/smartctl-temp-log
-index 9deaa9e..180b91e 100755
---- a/contrib/smartctl-temp-log
-+++ b/contrib/smartctl-temp-log
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # coding: utf-8
- """\
- Usage: smartctl-temp-log [device]
-diff --git a/contrib/temper-temp-log b/contrib/temper-temp-log
-index 441d4ff..6f69605 100755
---- a/contrib/temper-temp-log
-+++ b/contrib/temper-temp-log
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # coding: utf-8
- """\
- Usage: temper-temper-log
-diff --git a/contrib/zone-temp-log b/contrib/zone-temp-log
-index a3cbbce..5277a0f 100755
---- a/contrib/zone-temp-log
-+++ b/contrib/zone-temp-log
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # coding: utf-8
- """\
- Usage: zone-temper-log
-diff --git a/devel/linkcheck b/devel/linkcheck
-index 528de19..bf31e65 100755
---- a/devel/linkcheck
-+++ b/devel/linkcheck
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- #
- # linkcheck - check link integrity in an asciidoc document tree
- #
-diff --git a/devel/python_paths.py b/devel/python_paths.py
-index d17e592..d4dc616 100755
---- a/devel/python_paths.py
-+++ b/devel/python_paths.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- 
- """Find all Pythons in the command path, and corresponding exe/lib locations.
- 
-diff --git a/devel/release.nix b/devel/release.nix
-index 9bc7e32..db87d23 100644
---- a/devel/release.nix
-+++ b/devel/release.nix
-@@ -29,7 +29,7 @@ in with derivationOptions; rec {
-       runHook preDist
- 
-       echo "dist flags: $distFlags ''${distFlagsArray[@]}"
--      python waf dist $distFlags "''${distFlagsArray[@]}"
-+      python3 waf dist $distFlags "''${distFlagsArray[@]}"
- 
-       if [ "$dontCopyDist" != 1 ]; then       
-         mkdir -p "$out/tarballs"
-@@ -57,7 +57,7 @@ in with derivationOptions; rec {
-         fi
- 
-         echo "configure flags: $configureFlags ''${configureFlagsArray[@]}"
--        python waf configure $configureFlags "''${configureFlagsArray[@]}"
-+        python3 waf configure $configureFlags "''${configureFlagsArray[@]}"
- 
-         runHook postConfigure
-       '';
-@@ -66,7 +66,7 @@ in with derivationOptions; rec {
-         runHook preBuild
- 
-         echo "build flags: $makeFlags ''${makeFlagsArray[@]} $buildFlags ''${buildFlagsArray[@]}"
--        python waf build \
-+        python3 waf build \
-           ''${enableParallelBuilding:+-j$NIX_BUILD_CORES} \
-           $makeFlags "''${makeFlagsArray[@]}" \
-           $buildFlags "''${buildFlagsArray[@]}"
-@@ -79,7 +79,7 @@ in with derivationOptions; rec {
-           runHook preCheck
- 
-           echo "check flags: $makeFlags ''${makeFlagsArray[@]} ''${checkFlags:+-v} ''${checkFlagsArray[@]}"
--          python waf check \
-+          python3 waf check \
-             ''${enableParallelBuilding:+-j$NIX_BUILD_CORES} \
-             $makeFlags "''${makeFlagsArray[@]}" \
-             ''${checkFlags:+-v} "''${checkFlagsArray[@]}"
-@@ -94,7 +94,7 @@ in with derivationOptions; rec {
-         mkdir -p "$prefix"
- 
-         echo "install flags: $makeFlags ''${makeFlagsArray[@]} ''${installFlags:+-v} ''${installFlagsArray[@]}"
--        python waf install \
-+        python3 waf install \
-           $makeFlags "''${makeFlagsArray[@]}" \
-           ''${installFlags:+-v} "''${installFlagsArray[@]}"
- 
-diff --git a/ntpclients/ntpdig.py b/ntpclients/ntpdig.py
-index 9dc5aab..56dfc47 100644
---- a/ntpclients/ntpdig.py
-+++ b/ntpclients/ntpdig.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # -*- coding: utf-8 -*-
- """
- ntpdig - simple SNTP client
-diff --git a/ntpclients/ntpkeygen.py b/ntpclients/ntpkeygen.py
-index 8d3b37d..d9ab0ba 100644
---- a/ntpclients/ntpkeygen.py
-+++ b/ntpclients/ntpkeygen.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # -*- coding: utf-8 -*-
- '''
- ntpkeygen - generate cryptographic keys for NTP clients and servers
-diff --git a/ntpclients/ntploggps.py b/ntpclients/ntploggps.py
-index fe44914..8d498b9 100644
---- a/ntpclients/ntploggps.py
-+++ b/ntpclients/ntploggps.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # -*- coding: utf-8 -*-
- 
- """\
-diff --git a/ntpclients/ntplogtemp.py b/ntpclients/ntplogtemp.py
-index 3129822..3a4b00a 100644
---- a/ntpclients/ntplogtemp.py
-+++ b/ntpclients/ntplogtemp.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # -*- coding: utf-8 -*-
- 
- """\
-diff --git a/ntpclients/ntpmon.py b/ntpclients/ntpmon.py
-index d286f67..25083b2 100644
---- a/ntpclients/ntpmon.py
-+++ b/ntpclients/ntpmon.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # -*- coding: utf-8 -*-
- 
- # SPDX-License-Identifier: BSD-2-Clause
-diff --git a/ntpclients/ntpq.py b/ntpclients/ntpq.py
-index 5e17df0..7bba901 100644
---- a/ntpclients/ntpq.py
-+++ b/ntpclients/ntpq.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # -*- coding: utf-8 -*-
- #
- # ntpq - query an NTP server using mode 6 commands
-diff --git a/ntpclients/ntpsnmpd.py b/ntpclients/ntpsnmpd.py
-index 1382f19..34a9448 100644
---- a/ntpclients/ntpsnmpd.py
-+++ b/ntpclients/ntpsnmpd.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # -*- coding: utf-8 -*-
- 
- from __future__ import print_function, division
-diff --git a/ntpclients/ntpsweep.py b/ntpclients/ntpsweep.py
-index 22b2a45..732b2b1 100644
---- a/ntpclients/ntpsweep.py
-+++ b/ntpclients/ntpsweep.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # -*- coding: utf-8 -*-
- """
- ntpsweep - print various information about given NTP servers
-diff --git a/ntpclients/ntptrace.py b/ntpclients/ntptrace.py
-index 09c857e..1adea21 100644
---- a/ntpclients/ntptrace.py
-+++ b/ntpclients/ntptrace.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # -*- coding: utf-8 -*-
- """
- ntptrace - trace peers of an NTP server
-diff --git a/ntpclients/ntpviz.py b/ntpclients/ntpviz.py
-index 163f998..d501f0d 100644
---- a/ntpclients/ntpviz.py
-+++ b/ntpclients/ntpviz.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # -*- coding: utf-8 -*-
- """\
- ntpviz - visualizer for NTP log files
-diff --git a/ntpclients/ntpwait.py b/ntpclients/ntpwait.py
-index 972e83e..d879682 100644
---- a/ntpclients/ntpwait.py
-+++ b/ntpclients/ntpwait.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # -*- coding: utf-8 -*-
- """\
- ntpwait - Wait for ntpd to stabilize the system clock.
-diff --git a/pylib/agentx.py b/pylib/agentx.py
-index c018ac1..f1dd5f6 100644
---- a/pylib/agentx.py
-+++ b/pylib/agentx.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # -*- coding: utf-8 -*-
- 
- from __future__ import print_function, division
-diff --git a/pylib/poly.py b/pylib/poly.py
-index 8d29d67..d23606e 100644
---- a/pylib/poly.py
-+++ b/pylib/poly.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # -*- coding: utf-8 -*-
- # SPDX-License-Identifier: BSD-2-Clause
- """Handle bytes and strings in a polyglot fashion.
-diff --git a/tests/option-tester.sh b/tests/option-tester.sh
-index 0a513df..5dd9937 100755
---- a/tests/option-tester.sh
-+++ b/tests/option-tester.sh
-@@ -77,7 +77,7 @@ grep "The configuration failed"  test*/test.log
- grep ^Trouble                    test*/test.log
- echo
- 
--echo -n "## ";  python --version
-+echo -n "## ";  python3 --version
- if test -n "$PYTHONPATH"
- then
-   echo "## PYTHONPATH is" \"$PYTHONPATH\"
-diff --git a/tests/pylib/jigs.py b/tests/pylib/jigs.py
-index ca67c17..9cbc693 100644
---- a/tests/pylib/jigs.py
-+++ b/tests/pylib/jigs.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # -*- coding: utf-8 -*-
- 
- from __future__ import print_function, division
-diff --git a/tests/pylib/test_agentx.py b/tests/pylib/test_agentx.py
-index 211b3f9..cbf322a 100644
---- a/tests/pylib/test_agentx.py
-+++ b/tests/pylib/test_agentx.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # -*- coding: utf-8 -*-
- 
- import ntp.agentx as AX
-diff --git a/tests/pylib/test_agentx_packet.py b/tests/pylib/test_agentx_packet.py
-index 41ee384..ded4628 100644
---- a/tests/pylib/test_agentx_packet.py
-+++ b/tests/pylib/test_agentx_packet.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # -*- coding: utf-8 -*-
- 
- import unittest
-diff --git a/tests/pylib/test_packet.py b/tests/pylib/test_packet.py
-index 0ffb0d2..4825f54 100644
---- a/tests/pylib/test_packet.py
-+++ b/tests/pylib/test_packet.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # -*- coding: utf-8 -*-
- 
- from __future__ import print_function, division
-diff --git a/tests/pylib/test_statfiles.py b/tests/pylib/test_statfiles.py
-index 307ca87..d133727 100644
---- a/tests/pylib/test_statfiles.py
-+++ b/tests/pylib/test_statfiles.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # -*- coding: utf-8 -*-
- 
- import unittest
-diff --git a/tests/pylib/test_util.py b/tests/pylib/test_util.py
-index 3a3ce85..64f2955 100644
---- a/tests/pylib/test_util.py
-+++ b/tests/pylib/test_util.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # -*- coding: utf-8 -*-
- 
- from __future__ import print_function
-diff --git a/waf b/waf
-index 044af45..24eb3dd 100755
---- a/waf
-+++ b/waf
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # encoding: latin-1
- # Thomas Nagy, 2005-2018
- #
-diff --git a/wafhelpers/pythonize-header b/wafhelpers/pythonize-header
-index c58542a..f5ce2ad 100755
---- a/wafhelpers/pythonize-header
-+++ b/wafhelpers/pythonize-header
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # -*- coding: utf-8 -*-
- """
- Generate a Python module from a C file of macro definitions.