gentoo resync : 09.07.2022

6 files changed, 2 insertions, 363 deletions

diff --git a/net-dns/dnsviz/Manifest b/net-dns/dnsviz/Manifest
index bfa641e5b628..5cbd459c9bf5 100644
--- a/net-dns/dnsviz/Manifest
+++ b/net-dns/dnsviz/Manifest
@@ -1,10 +1,3 @@
-AUX dnsviz-0.8.2-add-ed448-support.patch 6452 BLAKE2B 77f12acf3bd4224200f677b24899c56061a9d99d03de681bfa117869a7af4148faa30004a200cd6bb968ce53b67d1d3b72a0374e441ebc9ae96e22c3a88b9c95 SHA512 d2e60d7270267dac1237b8d32ae2a5b603972a9e9901eee03cf7d51e004f3d2aba911b3032f710f4b293b308b3507dfa74eede0e2a653b6c86b90123c9b847ad
-DIST dnsviz-0.8.2.tar.gz 404265 BLAKE2B c4ba6b5a7d6fee7c8e2cba0c90f29560152dd4beed1ef4d80a6a3bf9f81646ee8f0d61c38329233e300f2b434cb5d9e9d2a926dc72997ae68ff0a57e147bafcf SHA512 5414d9bda6c0bf5fdc5a84a09cb5833619110702749b12f87d63f5149de473f4bd1b6960c506c60ec5fc5ff82d789536cee70a299ff13c960a45776de2916c80
-DIST dnsviz-0.9.2.tar.gz 477947 BLAKE2B 62b94e6b05d1129d5c4655ff1faf8adb3c2eec868db6049e09dd180cebccab94412eee25293d83ec3e6bc5b18fae33ba0acfe3c3b30cececdd4952005879eab0 SHA512 8ad9e1aabb4704ff4939617532c32e5edde0d369efd2e4a7a6f30d33b8bac941b2d1073e98fed90e2a11438a0b1c18b8fafe07f4122fb888ebdb24bd2426abf6
-DIST dnsviz-0.9.3.tar.gz 477931 BLAKE2B e3e020fdddacdf06a4e7b78edade72136d6530dac5b243b30e97f609c9fb3b912fb6d6c00b8c54e17f1d2ba411a2b116f9cb89bfc51c01f43d8a1a03a00755aa SHA512 8ccaa29df6cc7824db7153950d5cb423d1ac7a76ae20a15b35c2e66d362b3340e23a9973f71b884ea7e7b861e2bb0051e32abc3e45795792a7db3b01b62449c5
 DIST dnsviz-0.9.4.tar.gz 477971 BLAKE2B 3c8bebcea89bc6e78247c45c4266f73be4f9f618bfaa48a47460a43deb4789fe71eaa77eb4ff59c2d8e863cdfdddaf5908279aad93ffd63fdbe16d0966aa943b SHA512 b88d0ddff6279078a5222b4250a404c39db6d896d57bba51c878c8b8d01582deda2fe67b5f6370d7a98389e09ad46bdf3903d77fee91c0291b14a9109f1739e3
-EBUILD dnsviz-0.8.2-r1.ebuild 1665 BLAKE2B 8fc98b6e8541017e8ef69860f5f4c303ae0bd1052df844d292d32b9f4cbe8fa8c948c113cabbd79c3956637401c3ce6296e327b7c469a63eb9e12e6966d6a95f SHA512 6d282ff6cd563d83b8fe667bc65ba16dd714938301df646025d6f68cea456e6eb1390fc18279ab4bf3f8d143d151c648d688d2c76b8b8e0653b7e02a1b1fad0b
-EBUILD dnsviz-0.9.2.ebuild 1463 BLAKE2B 6a71e37c098775c6b3ed137b7226481e89ecc1acf64c618dd3c7d13c47b2ea8fe4912fc7a3120787c1ba5ff17f74909d226b4b7c75a87e3ac38651cab79d1b13 SHA512 197a8c4423fb4f62d1dc7386be493e307d746bc5b61be4a6130150ec4aa09f4979c1eae460ad1428c4f0d75da0ef93b969bbd8694eeaa44198de2c4b7d1b0ad4
-EBUILD dnsviz-0.9.3.ebuild 1463 BLAKE2B 6a71e37c098775c6b3ed137b7226481e89ecc1acf64c618dd3c7d13c47b2ea8fe4912fc7a3120787c1ba5ff17f74909d226b4b7c75a87e3ac38651cab79d1b13 SHA512 197a8c4423fb4f62d1dc7386be493e307d746bc5b61be4a6130150ec4aa09f4979c1eae460ad1428c4f0d75da0ef93b969bbd8694eeaa44198de2c4b7d1b0ad4
 EBUILD dnsviz-0.9.4.ebuild 1463 BLAKE2B fe1a695ec737219689900334fcbb908aab7bd1b299f73763a65af21d0067519abdf0864bde5362195b7509ccef0ea4b544c327f8b59934189028defaf55d66fa SHA512 17eee874998d6a5f28cdd6c0b78e78d7c251f59d48851d677f7727898fba580e6d4915d347d2a03845ada860407db2b8fc277124e912ae3dffe73dd42390fb0d
-MISC metadata.xml 718 BLAKE2B 556f60636b5e538fdb399b5b385ab835370688ac9720ecd980d700b1383b20cd0524c5af7255f14bd51ee18b771d0028d5a156eae07594e0ef2ae8aca53e9111 SHA512 06734ac2b97b065e442672a38a00ccc182c095d94847d588d4471eb00021b338c3ff6ce2144d2c2b66d8f2019a826b4cd5e95eb2aaac840e7bf0acc132f7ba5e
+MISC metadata.xml 482 BLAKE2B 0cbdba25f485a7eca25f8c9978f16637878cca931ce4f43320efe579b35286c6a1ce8319d2144f5e48367b61d3c0818f076848f6bb86ecc3fdb98d62ff74c184 SHA512 1c4d34e000391515754dc345f56894279dfcf142dc7c12e91276f437d932c3d744c4ec36fd342f8a9040394d0c63af2113ebeea25d743b49b9d0359406827eb4
diff --git a/net-dns/dnsviz/dnsviz-0.8.2-r1.ebuild b/net-dns/dnsviz/dnsviz-0.8.2-r1.ebuild
deleted file mode 100644
index e3feb492a94d..000000000000
--- a/net-dns/dnsviz/dnsviz-0.8.2-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Tool suite for analysis and visualization of DNS and DNSSEC"
-HOMEPAGE="https://dnsviz.net/"
-SRC_URI="https://github.com/dnsviz/dnsviz/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	dev-python/dnspython[${PYTHON_USEDEP}]
-	>=dev-python/m2crypto-0.31.0[${PYTHON_USEDEP}]
-	>=dev-python/pygraphviz-1.3.1[${PYTHON_USEDEP}]"
-
-RDEPEND="
-	${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.8.2-add-ed448-support.patch )
-
-python_prepare_all() {
-	# Fix the ebuild to use correct FHS/Gentoo policy paths for 0.8.2
-	sed -i \
-		-e "s|share/doc/dnsviz|share/doc/${PF}|g" \
-			"${S}"/setup.py \
-			|| die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	distutils_install_for_testing
-
-	"${EPYTHON}" tests/offline_tests.py -v || die
-
-	# No need to pull in net-dns/bind for this small test
-	if hash named-checkconf &>/dev/null ; then
-		"${EPYTHON}" tests/local_probe_tests.py -v || die
-	else
-		einfo "Skipping local_probe_tests -- named-checkconf not found!"
-	fi
-}
-
-pkg_postinst() {
-	optfeature "Support for pre-deployment testing" net-dns/bind
-
-	# Warn about extra requirements for >=OpenSSL 1.1.0
-	if has_version '=dev-libs/openssl-1.1*'; then
-		ewarn "With OpenSSL version 1.1.0 and later,the OpenSSL GOST Engine"
-		ewarn "is necessary to validate DNSSEC signatures with algorithm 12"
-		ewarn "(GOST R 34.10-2001) and digests of type 3 (GOST R 34.11-94)"
-		ewarn "OpenSSL GOST Engine can be get from --> dev-libs/gost-engine"
-	fi
-}
diff --git a/net-dns/dnsviz/dnsviz-0.9.2.ebuild b/net-dns/dnsviz/dnsviz-0.9.2.ebuild
deleted file mode 100644
index d1f444d39db4..000000000000
--- a/net-dns/dnsviz/dnsviz-0.9.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Tool suite for analysis and visualization of DNS and DNSSEC"
-HOMEPAGE="https://dnsviz.net/"
-SRC_URI="https://github.com/dnsviz/dnsviz/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? ( net-dns/bind )"
-
-DEPEND=">=dev-python/dnspython-1.13[${PYTHON_USEDEP}]
-	>=dev-python/m2crypto-0.37.0[${PYTHON_USEDEP}]
-	>=dev-python/pygraphviz-1.3.1[${PYTHON_USEDEP}]"
-
-RDEPEND="${DEPEND}"
-
-python_prepare_all() {
-	# Fix the ebuild to use correct FHS/Gentoo policy paths
-	sed -i \
-		-e "s|share/doc/dnsviz|share/doc/${PF}|g" \
-			"${S}"/setup.py \
-			|| die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	distutils_install_for_testing
-
-	"${EPYTHON}" tests/dnsviz_probe_run_offline.py -v || die
-	"${EPYTHON}" tests/dnsviz_print_options.py -v || die
-	"${EPYTHON}" tests/dnsviz_print_run.py -v || die
-	"${EPYTHON}" tests/dnsviz_graph_options.py -v || die
-	"${EPYTHON}" tests/dnsviz_graph_run.py -v || die
-	"${EPYTHON}" tests/dnsviz_grok_options.py -v || die
-	"${EPYTHON}" tests/dnsviz_grok_run.py -v || die
-}
-
-pkg_postinst() {
-	optfeature "Support for pre-deployment testing" net-dns/bind
-	optfeature "Support for DNSSEC signatures using GOST algorithm or digest" dev-libs/ghost-engine
-}
diff --git a/net-dns/dnsviz/dnsviz-0.9.3.ebuild b/net-dns/dnsviz/dnsviz-0.9.3.ebuild
deleted file mode 100644
index d1f444d39db4..000000000000
--- a/net-dns/dnsviz/dnsviz-0.9.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Tool suite for analysis and visualization of DNS and DNSSEC"
-HOMEPAGE="https://dnsviz.net/"
-SRC_URI="https://github.com/dnsviz/dnsviz/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? ( net-dns/bind )"
-
-DEPEND=">=dev-python/dnspython-1.13[${PYTHON_USEDEP}]
-	>=dev-python/m2crypto-0.37.0[${PYTHON_USEDEP}]
-	>=dev-python/pygraphviz-1.3.1[${PYTHON_USEDEP}]"
-
-RDEPEND="${DEPEND}"
-
-python_prepare_all() {
-	# Fix the ebuild to use correct FHS/Gentoo policy paths
-	sed -i \
-		-e "s|share/doc/dnsviz|share/doc/${PF}|g" \
-			"${S}"/setup.py \
-			|| die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	distutils_install_for_testing
-
-	"${EPYTHON}" tests/dnsviz_probe_run_offline.py -v || die
-	"${EPYTHON}" tests/dnsviz_print_options.py -v || die
-	"${EPYTHON}" tests/dnsviz_print_run.py -v || die
-	"${EPYTHON}" tests/dnsviz_graph_options.py -v || die
-	"${EPYTHON}" tests/dnsviz_graph_run.py -v || die
-	"${EPYTHON}" tests/dnsviz_grok_options.py -v || die
-	"${EPYTHON}" tests/dnsviz_grok_run.py -v || die
-}
-
-pkg_postinst() {
-	optfeature "Support for pre-deployment testing" net-dns/bind
-	optfeature "Support for DNSSEC signatures using GOST algorithm or digest" dev-libs/ghost-engine
-}
diff --git a/net-dns/dnsviz/files/dnsviz-0.8.2-add-ed448-support.patch b/net-dns/dnsviz/files/dnsviz-0.8.2-add-ed448-support.patch
deleted file mode 100644
index 1d4d88e97e6d..000000000000
--- a/net-dns/dnsviz/files/dnsviz-0.8.2-add-ed448-support.patch
+++ /dev/null
@@ -1,182 +0,0 @@
-From 99bb0c7430c9f954582eabd3a9581fe0db6f2e81 Mon Sep 17 00:00:00 2001
-From: Pascal Ernster <git@hardfalcon.net>
-Date: Mon, 22 Jul 2019 04:25:18 +0200
-Subject: [PATCH] Replace libnacl with python-cryptography, add support for
- algo 16 (Ed448)
-
-Origin: https://github.com/dnsviz/dnsviz/pull/54
-
----
- Dockerfile              |  2 +-
- README.md               |  8 ++++----
- contrib/dnsviz-py2.spec |  2 +-
- contrib/dnsviz-py3.spec |  2 +-
- dnsviz/crypto.py        | 30 +++++++++++++++++++++++++-----
- requirements.txt        |  2 +-
- setup.py                |  2 +-
- 7 files changed, 34 insertions(+), 14 deletions(-)
-
-diff --git a/Dockerfile b/Dockerfile
-index dc6a0d9e..61a319de 100644
---- a/Dockerfile
-+++ b/Dockerfile
-@@ -2,7 +2,7 @@ FROM alpine:edge
- 
- RUN apk add python3 graphviz ttf-liberation libsodium bind bind-tools
- RUN apk add --virtual builddeps linux-headers python3-dev graphviz-dev gcc libc-dev openssl-dev swig && \
--	pip3 install pygraphviz m2crypto dnspython libnacl && \
-+	pip3 install pygraphviz m2crypto dnspython cryptography && \
- 	apk del builddeps
- 
- COPY . /tmp/dnsviz
-diff --git a/README.md b/README.md
-index e9dcda83..03d9c3dd 100644
---- a/README.md
-+++ b/README.md
-@@ -41,7 +41,7 @@ Instructions for running in a Docker container are also available
- 
- * M2Crypto (0.28.0 or later) - https://gitlab.com/m2crypto/m2crypto
- 
--* libnacl - https://github.com/saltstack/libnacl
-+* Cryptography (2.6 or later) - https://cryptography.io/
- 
- Note that the software versions listed above are known to work with the current
- version of DNSViz.  Other versions might also work well together, but might
-@@ -85,7 +85,7 @@ $ source ~/myenv/bin/activate
- ```
- (Note that this installs the dependencies that are python packages, but some of
- these packages have non-python dependecies, such as Graphviz (required for
--pygraphviz) and libsodium (required for libnacl), that are not installed
-+pygraphviz) and OpenSSL (required for Cryptography), that are not installed
- automatically.)
- 
- Next download and install DNSViz from the Python Package Index (PyPI):
-@@ -121,9 +121,9 @@ $ cp dist/dnsviz-*.tar.gz ~/rpmbuild/SOURCES/
- $ cp contrib/dnsviz-py${PY_VERS}.spec ~/rpmbuild/SPECS/dnsviz.spec
- ```
- 
--Install dnspython, pygraphviz, M2Crypto, and libnacl.
-+Install dnspython, pygraphviz, M2Crypto, and Cryptography.
- ```
--$ sudo dnf install python${PY_VERS}-dns python${PY_VERS}-pygraphviz python${PY_VERS}-libnacl
-+$ sudo dnf install python${PY_VERS}-dns python${PY_VERS}-pygraphviz python${PY_VERS}-cryptography
- ```
- For python2:
- ```
-diff --git a/contrib/dnsviz-py2.spec b/contrib/dnsviz-py2.spec
-index 0bea597b..65033c95 100644
---- a/contrib/dnsviz-py2.spec
-+++ b/contrib/dnsviz-py2.spec
-@@ -15,7 +15,7 @@ BuildRequires:  make
- Requires:       python2-pygraphviz >= 1.3
- Requires:       m2crypto >= 0.28.0
- Requires:       python2-dns >= 1.13
--Requires:       python2-libnacl
-+Requires:       python2-cryptography
- 
- %description
- DNSViz is a tool suite for analysis and visualization of Domain Name System
-diff --git a/contrib/dnsviz-py3.spec b/contrib/dnsviz-py3.spec
-index ef25f4b5..975f3e10 100644
---- a/contrib/dnsviz-py3.spec
-+++ b/contrib/dnsviz-py3.spec
-@@ -15,7 +15,7 @@ BuildRequires:  make
- Requires:       python3-pygraphviz >= 1.3
- Requires:       python3-m2crypto >= 0.28.0
- Requires:       python3-dns >= 1.13
--Requires:       python3-libnacl
-+Requires:       python3-cryptography
- 
- %description
- DNSViz is a tool suite for analysis and visualization of Domain Name System
-diff --git a/dnsviz/crypto.py b/dnsviz/crypto.py
-index b011cbf3..283eac4d 100644
---- a/dnsviz/crypto.py
-+++ b/dnsviz/crypto.py
-@@ -55,7 +55,7 @@
-         'M2Crypto >= 0.21.1': (set([1,5,7,8,10]), set([1,2,4]), set([1])),
-         'M2Crypto >= 0.24.0': (set([3,6,13,14]), set(), set()),
-         'M2Crypto >= 0.24.0 and either openssl < 1.1.0 or openssl >= 1.1.0 plus the OpenSSL GOST Engine': (set([12]), set([3]), set()),
--        'libnacl': (set([15]), set(), set()),
-+        'cryptography': (set([15,16]), set(), set()),
- }
- _logged_modules = set()
- 
-@@ -72,12 +72,19 @@
-     _supported_digest_algs.update(set([1,2,4]))
- 
- try:
--    from libnacl.sign import Verifier as ed25519Verifier
-+    from cryptography.hazmat.primitives.asymmetric.ed25519 import Ed25519PublicKey
- except ImportError:
-     pass
- else:
-     _supported_algs.add(15)
- 
-+try:
-+    from cryptography.hazmat.primitives.asymmetric.ed448 import Ed448PublicKey
-+except ImportError:
-+    pass
-+else:
-+    _supported_algs.add(16)
-+
- GOST_PREFIX = b'\x30\x63\x30\x1c\x06\x06\x2a\x85\x03\x02\x02\x13\x30\x12\x06\x07\x2a\x85\x03\x02\x02\x23\x01\x06\x07\x2a\x85\x03\x02\x02\x1e\x01\x03\x43\x00\x04\x40'
- GOST_ENGINE_NAME = b'gost'
- GOST_DIGEST_NAME = b'GOST R 34.11-94'
-@@ -386,10 +393,21 @@ def _validate_rrsig_ec(alg, sig, msg, key):
- 
- def _validate_rrsig_ed25519(alg, sig, msg, key):
-     try:
--        verifier = ed25519Verifier(binascii.hexlify(key))
--        return verifier.verify(sig + msg) == msg
--    except ValueError:
-+        verifier = Ed25519PublicKey.from_public_bytes(key)
-+        verifier.verify(sig, msg)
-+    except:
-         return False
-+    else:
-+        return True
-+
-+def _validate_rrsig_ed448(alg, sig, msg, key):
-+    try:
-+        verifier = Ed448PublicKey.from_public_bytes(key)
-+        verifier.verify(sig, msg)
-+    except:
-+        return False
-+    else:
-+        return True
- 
- def validate_rrsig(alg, sig, msg, key):
-     if not alg_is_supported(alg):
-@@ -407,6 +425,8 @@ def validate_rrsig(alg, sig, msg, key):
-         return _validate_rrsig_ec(alg, sig, msg, key)
-     elif alg in (15,):
-         return _validate_rrsig_ed25519(alg, sig, msg, key)
-+    elif alg in (16,):
-+        return _validate_rrsig_ed448(alg, sig, msg, key)
- 
- def get_digest_for_nsec3(val, salt, alg, iterations):
-     if not nsec3_alg_is_supported(alg):
-diff --git a/requirements.txt b/requirements.txt
-index d6b2de5e..af2be235 100644
---- a/requirements.txt
-+++ b/requirements.txt
-@@ -1,4 +1,4 @@
- dnspython
- pygraphviz
- m2crypto
--libnacl
-+cryptography
-diff --git a/setup.py b/setup.py
-index ba1016e3..b531c025 100644
---- a/setup.py
-+++ b/setup.py
-@@ -135,7 +135,7 @@ def run(self):
-                 'pygraphviz (>=1.1)',
-                 'm2crypto (>=0.24.0)',
-                 'dnspython (>=1.11)',
--                'libnacl',
-+                'cryptography (>=2.6)',
-         ],
-         classifiers=[
-                 'Development Status :: 5 - Production/Stable',
diff --git a/net-dns/dnsviz/metadata.xml b/net-dns/dnsviz/metadata.xml
index dd590e429417..4d5fa79a603b 100644
--- a/net-dns/dnsviz/metadata.xml
+++ b/net-dns/dnsviz/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>hasan.calisir@psauxit.com</email>
-		<name>Hasan ÇALIŞIR</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 	DNSViz is a tool suite for analysis and visualization of Domain Name 
 	System (DNS) behavior, including its security extensions (DNSSEC).