- Add a patch from upstream to fix a Python 2.7 issue.

This commit is contained in:
Jeffrey C. Ollie 2010-08-13 12:04:20 -05:00
parent f2cd60f792
commit 5a0206fd83
2 changed files with 42 additions and 1 deletions

View File

@ -0,0 +1,36 @@
From e80c56c6c5c6dd7aa12c439b1f3b664811f65dcb Mon Sep 17 00:00:00 2001
From: Bob Halley <halley@nominum.com>
Date: Wed, 10 Mar 2010 14:22:32 +0000
Subject: [PATCH] The TSIG algorithm was being passed to use_tsig() incorrectly.
---
diff --git a/dns/resolver.py b/dns/resolver.py
index 372d7d8..cd0e5f8 100644
--- a/dns/resolver.py
+++ b/dns/resolver.py
@@ -593,7 +593,8 @@ class Resolver(object):
return answer
request = dns.message.make_query(qname, rdtype, rdclass)
if not self.keyname is None:
- request.use_tsig(self.keyring, self.keyname, self.keyalgorithm)
+ request.use_tsig(self.keyring, self.keyname,
+ algorithm=self.keyalgorithm)
request.use_edns(self.edns, self.ednsflags, self.payload)
response = None
#
diff --git a/dns/update.py b/dns/update.py
index 7d42636..97aea18 100644
--- a/dns/update.py
+++ b/dns/update.py
@@ -56,7 +56,7 @@ class Update(dns.message.Message):
self.find_rrset(self.question, self.origin, rdclass, dns.rdatatype.SOA,
create=True, force_unique=True)
if not keyring is None:
- self.use_tsig(keyring, keyname, keyalgorithm)
+ self.use_tsig(keyring, keyname, algorithm=keyalgorithm)
def _add_rr(self, name, ttl, rd, deleting=None, section=None):
"""Add a single RR to the update section."""
--
1.7.2.1

View File

@ -2,7 +2,7 @@
Name: python-dns Name: python-dns
Version: 1.8.0 Version: 1.8.0
Release: 2.1%{?dist} Release: 3%{?dist}
Summary: DNS toolkit for Python Summary: DNS toolkit for Python
Group: Development/Languages Group: Development/Languages
@ -10,6 +10,7 @@ License: MIT
URL: http://www.dnspython.org/ URL: http://www.dnspython.org/
Source0: http://www.dnspython.org/kits/%{version}/dnspython-%{version}.tar.gz Source0: http://www.dnspython.org/kits/%{version}/dnspython-%{version}.tar.gz
Source1: http://www.dnspython.org/kits/%{version}/dnspython-%{version}.tar.gz.asc Source1: http://www.dnspython.org/kits/%{version}/dnspython-%{version}.tar.gz.asc
Patch0: 0001-The-TSIG-algorithm-was-being-passed-to-use_tsig-inco.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch BuildArch: noarch
@ -31,6 +32,7 @@ manipulation of DNS zones, messages, names, and records.
%prep %prep
%setup0 -q -n dnspython-%{version} %setup0 -q -n dnspython-%{version}
%patch0 -p1
# strip executable permissions so that we don't pick up dependencies # strip executable permissions so that we don't pick up dependencies
# from documentation # from documentation
@ -65,6 +67,9 @@ rm -rf %{buildroot}
%{python_sitelib}/dns %{python_sitelib}/dns
%changelog %changelog
* Fri Aug 13 2010 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.8.0-3
- Add a patch from upstream to fix a Python 2.7 issue.
* Thu Jul 22 2010 David Malcolm <dmalcolm@redhat.com> - 1.8.0-2.1 * Thu Jul 22 2010 David Malcolm <dmalcolm@redhat.com> - 1.8.0-2.1
- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild