From 4c5e0520b3ae5cce70461c3f7fceb313186d6ea2 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 7 Mar 2024 19:06:59 +0000 Subject: gentoo auto-resync : 07:03:2024 - 19:06:58 --- dev-python/dnspython/Manifest | 7 +-- dev-python/dnspython/dnspython-2.5.0.ebuild | 53 ----------------- dev-python/dnspython/dnspython-2.6.0.ebuild | 47 --------------- dev-python/dnspython/dnspython-2.6.1.ebuild | 2 +- .../files/dnspython-2.5.0-musl-test.patch | 67 ---------------------- 5 files changed, 2 insertions(+), 174 deletions(-) delete mode 100644 dev-python/dnspython/dnspython-2.5.0.ebuild delete mode 100644 dev-python/dnspython/dnspython-2.6.0.ebuild delete mode 100644 dev-python/dnspython/files/dnspython-2.5.0-musl-test.patch (limited to 'dev-python/dnspython') diff --git a/dev-python/dnspython/Manifest b/dev-python/dnspython/Manifest index ca975c037533..db1204ab9493 100644 --- a/dev-python/dnspython/Manifest +++ b/dev-python/dnspython/Manifest @@ -1,8 +1,3 @@ -AUX dnspython-2.5.0-musl-test.patch 2797 BLAKE2B 0f2b3e9cce32de491ea9fc1c896a0acbf27972a75fc75fca9440faad1aa4f2e5adfaf44f2f94518fcc95793381d73c742d902fd94d44262be6892b97d7414011 SHA512 93ca5a2cce940c505a35846aa96cdae235f3871c4b2e871ed6b61860c4b22cf927b684ca9c651bcf1c1fd939990fe1145adb9217d42715c6dba10608a9a5e90d -DIST dnspython-2.5.0.gh.tar.gz 366093 BLAKE2B f8e3d8632a74b0421f7c77316dc80e01936277d701c282239ed60e79952755d34c673f15e19d4da812883e33d5f2cb54a8faa419185d8d198de923a2f3861095 SHA512 8ed207f9cee88dc1deb626d727c510dabace327586911e340df435c8cce5936efee51937b52881b4b4452d9c8c5bd903044bfef5a4effa95aaf05f24c0213b07 -DIST dnspython-2.6.0.gh.tar.gz 372953 BLAKE2B c35a994ff0573a175a8011ef84291ea9de3450e4e57ae059c756cdb5e3163a736057b994e0d370b3c237eff7cf2650b7faae1f11071c53e9c953e655f539f8f3 SHA512 68361d624af6b308669a20316c9046e23135fdaec69f0dd0580f865b363565b813d836aaf9ddd1db5c51a831bd34ddbf6136b6bf72d2e91833d4c7c209528c2b DIST dnspython-2.6.1.gh.tar.gz 373684 BLAKE2B 63ac506d528a9e3684daf4888b51d732d9a12c3439ff1c353250a7bad78781f9f12bb13509e69093d5585a4a04bf2fbb1b8eb690a39f27e5d58e8f0f3b3b36a8 SHA512 77e9c69ac70e9e31a11188b968d28b8f2890b053b2cce0e608eefad7fd2c2b0f30c074222b2e5e85c0b4b8705f2e45acfa8b016a7808cc421df1d77f2561d978 -EBUILD dnspython-2.5.0.ebuild 1210 BLAKE2B 95debb590399bf85840b458cd562dc378571150cb691f2ca3deee71afb74ac091681670a16af4d58dc6076f62768197d16b5ad72aa4118bc008b53d540d92c3a SHA512 b1b5f5d16de165ea0ed08d9fe9cee3e4756c661cf706e837368102396c71f6a765b3a2bd006da16018935bd77d067b765e3e6d1b2103859829407cf6373bbbc6 -EBUILD dnspython-2.6.0.ebuild 1027 BLAKE2B 0575a64e02ae1f60d17083e87b30b3a7a90735c2fcd0014c16a52662dd5dd5017ce683ba03c8d936bc9ea02c7529ca584612201fff2301a295c362c6d63a06e2 SHA512 3c8798e6fe0fa22fab1de512b4b2c5e4b46493598f0a0bc5bdd87a8a7a8ebd01bc8624728ed2a8b450aa844f626c439aaa85aff92e52ba2c41db2bafa5f5c13f -EBUILD dnspython-2.6.1.ebuild 1027 BLAKE2B 0575a64e02ae1f60d17083e87b30b3a7a90735c2fcd0014c16a52662dd5dd5017ce683ba03c8d936bc9ea02c7529ca584612201fff2301a295c362c6d63a06e2 SHA512 3c8798e6fe0fa22fab1de512b4b2c5e4b46493598f0a0bc5bdd87a8a7a8ebd01bc8624728ed2a8b450aa844f626c439aaa85aff92e52ba2c41db2bafa5f5c13f +EBUILD dnspython-2.6.1.ebuild 1019 BLAKE2B d1c3a237b907f156d0168360cd04bede130bf5bf57fbedaf35e08a98a573fa64df5027dc0597dc7f927cb508d0e900a6b1bfd8070ad9cc91647ba0215a0aa4be SHA512 c000f1f245f2223f704a2f52bc1f883c8ee43f008cdf41bb29b6a23b4f30b4cfeea6e0b9f024a7ae71ce1e501d98cdd9ff5b184fb529addd172c3ebb3779d413 MISC metadata.xml 1709 BLAKE2B abd502753325fedca3f1ca94818258c9d1b82f88766f9e005b35b3e79aff71ca2efaf06188e73ea30830f80ec011cdf5c42df320130c9295e13d3c427a148f8c SHA512 8c25d579a4a2a7c5ff34c21643a1386a434545f6b9b465f4aa8e07f7da3aee203bbc0341e930ddb767af431f64e8024ddd6cc8513cfce862c5900da4637bb1c8 diff --git a/dev-python/dnspython/dnspython-2.5.0.ebuild b/dev-python/dnspython/dnspython-2.5.0.ebuild deleted file mode 100644 index 76ebb1afdd58..000000000000 --- a/dev-python/dnspython/dnspython-2.5.0.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=hatchling -PYTHON_COMPAT=( python3_{10..12} pypy3 ) - -inherit distutils-r1 - -DESCRIPTION="DNS toolkit for Python" -HOMEPAGE=" - https://www.dnspython.org/ - https://github.com/rthalley/dnspython/ - https://pypi.org/project/dnspython/ -" -SRC_URI=" - https://github.com/rthalley/dnspython/archive/v${PV}.tar.gz - -> ${P}.gh.tar.gz -" - -LICENSE="ISC" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -IUSE="dnssec examples" - -RDEPEND=" - dnssec? ( - >=dev-python/cryptography-41[${PYTHON_USEDEP}] - ) - >=dev-python/idna-2.1[${PYTHON_USEDEP}] -" -BDEPEND=" - test? ( - >=dev-python/cryptography-41[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest - -PATCHES=( - # https://github.com/rthalley/dnspython/issues/1035 - # https://github.com/rthalley/dnspython/commit/1b22985f2d67b6dd43259e3c6b853498f1cff712 - "${FILESDIR}/${P}-musl-test.patch" -) - -python_install_all() { - distutils-r1_python_install_all - if use examples; then - dodoc -r examples - docompress -x /usr/share/doc/${PF}/examples - fi -} diff --git a/dev-python/dnspython/dnspython-2.6.0.ebuild b/dev-python/dnspython/dnspython-2.6.0.ebuild deleted file mode 100644 index fa76df91c401..000000000000 --- a/dev-python/dnspython/dnspython-2.6.0.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=hatchling -PYTHON_COMPAT=( python3_{10..12} pypy3 ) - -inherit distutils-r1 - -DESCRIPTION="DNS toolkit for Python" -HOMEPAGE=" - https://www.dnspython.org/ - https://github.com/rthalley/dnspython/ - https://pypi.org/project/dnspython/ -" -SRC_URI=" - https://github.com/rthalley/dnspython/archive/v${PV}.tar.gz - -> ${P}.gh.tar.gz -" - -LICENSE="ISC" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -IUSE="dnssec examples" - -RDEPEND=" - dnssec? ( - >=dev-python/cryptography-41[${PYTHON_USEDEP}] - ) - >=dev-python/idna-2.1[${PYTHON_USEDEP}] -" -BDEPEND=" - test? ( - >=dev-python/cryptography-41[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest - -python_install_all() { - distutils-r1_python_install_all - if use examples; then - dodoc -r examples - docompress -x /usr/share/doc/${PF}/examples - fi -} diff --git a/dev-python/dnspython/dnspython-2.6.1.ebuild b/dev-python/dnspython/dnspython-2.6.1.ebuild index fa76df91c401..aefb1a3a556f 100644 --- a/dev-python/dnspython/dnspython-2.6.1.ebuild +++ b/dev-python/dnspython/dnspython-2.6.1.ebuild @@ -21,7 +21,7 @@ SRC_URI=" LICENSE="ISC" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" IUSE="dnssec examples" RDEPEND=" diff --git a/dev-python/dnspython/files/dnspython-2.5.0-musl-test.patch b/dev-python/dnspython/files/dnspython-2.5.0-musl-test.patch deleted file mode 100644 index a5aec3378fdd..000000000000 --- a/dev-python/dnspython/files/dnspython-2.5.0-musl-test.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 1b22985f2d67b6dd43259e3c6b853498f1cff712 Mon Sep 17 00:00:00 2001 -From: Bob Halley -Date: Sat, 27 Jan 2024 12:38:03 -0800 -Subject: [PATCH] In tests, work around musl libc and docker issues. - -Specifically: musl libc's getaddrinfo behavior always returns -a canonical name. - -Docker's resolver proxy doesn't do dangling CNAMEs correctly -and also answers NXDOMAIN in some cases where it should say -no error, no data. ---- - tests/test_async.py | 14 +++++++++++--- - tests/test_resolver.py | 21 +++++++++++++++------ - tests/test_resolver_override.py | 19 ++++++++++++------- - tests/util.py | 10 +++++++++- - 4 files changed, 47 insertions(+), 17 deletions(-) - -diff --git a/tests/test_resolver_override.py b/tests/test_resolver_override.py -index aed7a53d..be9e53f2 100644 ---- a/tests/test_resolver_override.py -+++ b/tests/test_resolver_override.py -@@ -69,7 +69,7 @@ def test_override(self): - dns.resolver.restore_system_resolver() - self.assertTrue(socket.getaddrinfo is dns.resolver._original_getaddrinfo) - -- def equivalent_info(self, a, b): -+ def equivalent_info(self, a, b, q): - if len(a) != len(b): - return False - for x in a: -@@ -78,16 +78,21 @@ def equivalent_info(self, a, b): - # looking for a zero protocol. - y = (x[0], x[1], 0, x[3], x[4]) - if y not in b: -- print("NOT EQUIVALENT") -- print(a) -- print(b) -- return False -+ # musl libc insists on always providing a canonical name, so -+ # accept that too. -+ y = (x[0], x[1], x[2], q, x[4]) -+ if y not in b: -+ print("NOT EQUIVALENT") -+ print(a) -+ print(b) -+ return False - return True - - def equivalent(self, *args, **kwargs): -+ q = args[0] - a = socket.getaddrinfo(*args, **kwargs) - b = dns.resolver._original_getaddrinfo(*args, **kwargs) -- return self.equivalent_info(a, b) -+ return self.equivalent_info(a, b, q) - - @unittest.skipIf( - sys.platform == "win32", "avoid windows original getaddrinfo issues" -@@ -139,7 +144,7 @@ def test_getaddrinfo_nxdomain(self): - def test_getaddrinfo_service(self): - a = socket.getaddrinfo("dns.google", "domain") - b = socket.getaddrinfo("dns.google", 53) -- self.assertTrue(self.equivalent_info(a, b)) -+ self.assertTrue(self.equivalent_info(a, b, "dns.google")) - try: - socket.getaddrinfo("dns.google", "domain", flags=socket.AI_NUMERICSERV) - self.assertTrue(False) # should not happen! -- cgit v1.2.3