Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/python-dns.git#0073c99802e42d946b3b415fbd4730348b95aedb
This commit is contained in:
DistroBaker 2020-11-27 10:36:22 +00:00
parent f38d949d3f
commit a868b3ee7c
2 changed files with 31 additions and 2 deletions

View File

@ -0,0 +1,25 @@
From 40af5eb2ede53e7b2e504d8049a17f95b0e45bbf Mon Sep 17 00:00:00 2001
From: Lumir Balhar <lbalhar@redhat.com>
Date: Fri, 27 Nov 2020 11:12:39 +0100
Subject: [PATCH] fix resolve chaining
---
dns/message.py | 2 ++
1 file changed, 2 insertions(+)
diff --git a/dns/message.py b/dns/message.py
index 9824e70..7b99431 100644
--- a/dns/message.py
+++ b/dns/message.py
@@ -776,6 +776,8 @@ class QueryMessage(Message):
except KeyError:
# Exit the chaining loop
break
+ else:
+ count += 1
if count >= MAX_CHAIN:
raise ChainTooLong
if self.rcode() == dns.rcode.NXDOMAIN and rrset is not None:
--
2.28.0

View File

@ -4,7 +4,7 @@
Name: python-%{py_package_name}
Version: 2.1.0
Release: 0.1.%{rctag}%{?dist}
Release: 0.2.%{rctag}%{?dist}
Summary: DNS toolkit for Python
# The entire package is licensed with both licenses, see LICENSE file
@ -12,7 +12,8 @@ License: ISC and MIT
URL: http://www.dnspython.org
Source0: https://github.com/rthalley/%{pypi_name}/archive/v%{version}%{rctag}/%{pypi_name}-%{version}%{rctag}.tar.gz
# Fix proposed upstream: https://github.com/rthalley/dnspython/issues/610#issuecomment-734704756
Patch0: 0001-fix-resolve-chaining.patch
BuildArch: noarch
BuildRequires: python3-devel
@ -71,6 +72,9 @@ find examples -type f | xargs chmod a-x
%{python3_sitelib}/%{pypi_name}-*.egg-info
%changelog
* Fri Nov 27 2020 Lumír Balhar <lbalhar@redhat.com> - 2.1.0-0.2.rc1
- Fix upstream issue in resolve chaining
* Wed Nov 18 2020 Lumír Balhar <lbalhar@redhat.com> - 2.1.0-0.1.rc1
- Update to 2.1.0-0.1.rc1 (#1893295)