import python-dns-2.2.1-2.el9

.gitignore

@@ -1 +1 @@
-SOURCES/dnspython-2.1.0.tar.gz
+SOURCES/dnspython-2.2.1.tar.gz

.python-dns.metadata

@@ -1 +1 @@
-b77f74ca6853c1a40c17c65f67fb4eec1c495b32 SOURCES/dnspython-2.1.0.tar.gz
+0689dbb669d348310514ca402a1f3b470708527e SOURCES/dnspython-2.2.1.tar.gz

SOURCES/0001-Skip-tests-that-require-external-network-connection_rhbz#1914296.patch

@@ -14,11 +14,11 @@ diff --git a/tests/test_async.py b/tests/test_async.py
 index 0252f22..370c6bb 100644
 --- a/tests/test_async.py
 +++ b/tests/test_async.py
-@@ -38,15 +38,8 @@ try:
+@@ -38,15 +38,10 @@ try:
  except Exception:
      _ssl_available = False
  
--
+
 -# Some tests require the internet to be available to run, so let's
 -# skip those if it's not there.
 -_network_available = True
@@ -26,12 +26,12 @@ index 0252f22..370c6bb 100644
 -    socket.gethostbyname('dnspython.org')
 -except socket.gaierror:
 -    _network_available = False
--
 +# RHEL 9 build environment does not have provide external network access.
 +_network_available = False
+
  
- # Probe for IPv4 and IPv6
- query_addresses = []
+ # Look for systemd-resolved, as it does dangling CNAME responses incorrectly.
+ #
 diff --git a/tests/test_query.py b/tests/test_query.py
 index 2cff377..99dc873 100644
 --- a/tests/test_query.py

SOURCES/0002-Do-not-build-with-setuptools-scm_rhbz#2088661.patch

@@ -0,0 +1,27 @@
+diff -Naur dnspython-2.2.1-orig/pyproject.toml dnspython-2.2.1/pyproject.toml
+--- dnspython-2.2.1-orig/pyproject.toml	2023-01-04 12:32:36.727371811 -0300
++++ dnspython-2.2.1/pyproject.toml	2023-01-04 12:36:36.898599002 -0300
+@@ -70,4 +70,3 @@
+ requires = ["poetry-core"]
+ build-backend = "poetry.core.masonry.api"
+ 
+-[tool.setuptools_scm]
+diff -Naur dnspython-2.2.1-orig/setup.cfg dnspython-2.2.1/setup.cfg
+--- dnspython-2.2.1-orig/setup.cfg	2023-01-04 12:32:36.727371811 -0300
++++ dnspython-2.2.1/setup.cfg	2023-01-04 12:36:24.587382315 -0300
+@@ -1,5 +1,6 @@
+ [metadata]
+ name = dnspython
++version = 2.2.1
+ author = Bob Halley
+ author_email = halley@dnspython.org
+ license = ISC
+@@ -46,7 +47,7 @@
+     dns.rdtypes.CH
+ python_requires = >=3.6
+ test_suite = tests
+-setup_requires = setuptools>=44; wheel; setuptools_scm[toml]>=3.4.3
++setup_requires = setuptools>=44
+ 
+ [options.extras_require]
+ DOH = httpx>=0.21.1; h2>=4.1.0; requests; requests-toolbelt

SOURCES/0003-Skip-DNSSEC-tests-with-SHA1_rhbz#2107651.patch

@@ -0,0 +1,50 @@
+diff -Naur dnspython-2.2.1/tests/test_dnssec.py dnspython-2.2.1-upd/tests/test_dnssec.py
+--- dnspython-2.2.1/tests/test_dnssec.py	2022-03-06 20:04:56.000000000 -0300
++++ dnspython-2.2.1-upd/tests/test_dnssec.py	2023-01-06 15:17:49.763218922 -0300
+@@ -271,18 +271,22 @@
+         self.assertEqual(dns.dnssec.key_id(rsamd5_keys[abs_example][0]), 30239)
+         self.assertEqual(dns.dnssec.key_id(rsamd5_keys[abs_example][1]), 62992)
+ 
++    @unittest.skip(reason="SHA1 is not supported.")
+     def testAbsoluteRSAGood(self):  # type: () -> None
+         dns.dnssec.validate(abs_soa, abs_soa_rrsig, abs_keys, None, when)
+ 
++    @unittest.skip(reason="SHA1 is not supported.")
+     def testDuplicateKeytag(self):  # type: () -> None
+         dns.dnssec.validate(abs_soa, abs_soa_rrsig, abs_keys_duplicate_keytag, None, when)
+ 
++    @unittest.skip(reason="SHA1 is not supported.")
+     def testAbsoluteRSABad(self):  # type: () -> None
+         def bad():  # type: () -> None
+             dns.dnssec.validate(abs_other_soa, abs_soa_rrsig, abs_keys, None,
+                                 when)
+         self.assertRaises(dns.dnssec.ValidationFailure, bad)
+ 
++    @unittest.skip(reason="SHA1 is not supported.")
+     def testRelativeRSAGood(self):  # type: () -> None
+         dns.dnssec.validate(rel_soa, rel_soa_rrsig, rel_keys,
+                             abs_dnspython_org, when)
+@@ -290,6 +294,7 @@
+         dns.dnssec.validate(rel_soa, rel_soa_rrsig, rel_keys,
+                             'dnspython.org', when)
+ 
++    @unittest.skip(reason="SHA1 is not supported.")
+     def testRelativeRSABad(self):  # type: () -> None
+         def bad():  # type: () -> None
+             dns.dnssec.validate(rel_other_soa, rel_soa_rrsig, rel_keys,
+@@ -358,6 +363,7 @@
+         dns.dnssec.validate(rsasha512_ns, rsasha512_ns_rrsig, rsasha512_keys,
+                             None, rsasha512_when)
+ 
++    @unittest.skip(reason="SHA1 is not supported.")
+     def testWildcardGoodAndBad(self):
+         dns.dnssec.validate(wildcard_txt, wildcard_txt_rrsig,
+                             wildcard_keys, None, wildcard_when)
+@@ -384,6 +390,7 @@
+             dns.dnssec.validate_rrsig(com_txt, com_txt_rrsig[0], wildcard_keys,
+                                       None, wildcard_when)
+ 
++    @unittest.skip(reason="SHA1 is not supported.")
+     def testAlternateParameterFormats(self):  # type: () -> None
+         # Pass rrset and rrsigset as (name, rdataset) tuples, not rrsets
+         rrset = (abs_soa.name, abs_soa.to_rdataset())

SPECS/python-dns.spec

@@ -13,8 +13,8 @@
 %endif
 
 Name:           python-%{py_package_name}
-Version:        2.1.0
-Release:        6%{?dist}
+Version:        2.2.1
+Release:        2%{?dist}
 Summary:        DNS toolkit for Python
 
 # The entire package is licensed with both licenses, see LICENSE file
@@ -23,6 +23,8 @@ URL:            http://www.dnspython.org
 
 Source0:        https://github.com/rthalley/%{pypi_name}/archive/v%{version}%{rctag}/%{pypi_name}-%{version}%{rctag}.tar.gz
 Patch0:         0001-Skip-tests-that-require-external-network-connection_rhbz#1914296.patch
+Patch1:         0002-Do-not-build-with-setuptools-scm_rhbz#2088661.patch
+Patch2:         0003-Skip-DNSSEC-tests-with-SHA1_rhbz#2107651.patch
 BuildArch:      noarch
 
 BuildRequires:  python3-devel
@@ -111,6 +113,16 @@ pytest -k "not testCanonicalNameDangling"
 }
 
 %changelog
+* Sat Jan 07 2023 Rafael Jeffman <rjeffman@redhat.com> - 2.2.1-2
+- Remove pycache from patch 0003.
+  Related: rhbz#2107651
+
+* Fri Jan 06 2023 Rafael Jeffman <rjeffman@redhat.com> - 2.2.1-1
+- Rebase to version 2.2.1
+  Resolves: rhbz#2088661
+- Disable DNSSEC tests using SHA1 due to crypto policies
+  Resolves: rhbz#2107651
+
 * Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 2.1.0-6
 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
   Related: rhbz#1991688