Merge branch 'master' into el5
This commit is contained in:
Jeffrey C. Ollie
commit
8d2def239a
|
|
@ -1 +1,2 @@
|
|||
dnspython-1.7.1.tar.gz
|
||||
dnspython-1.8.0.tar.gz
|
||||
dnspython-1.8.0.tar.gz.asc
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
@ -1,14 +1,16 @@
|
|||
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
|
||||
|
||||
Name: python-dns
|
||||
Version: 1.7.1
|
||||
Release: 1%{?dist}
|
||||
Version: 1.8.0
|
||||
Release: 3%{?dist}
|
||||
Summary: DNS toolkit for Python
|
||||
|
||||
Group: Development/Languages
|
||||
License: MIT
|
||||
URL: http://www.dnspython.org/
|
||||
Source0: http://www.dnspython.org/kits/%{version}/dnspython-%{version}.tar.gz
|
||||
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)
|
||||
|
||||
BuildArch: noarch
|
||||
|
|
@ -30,6 +32,7 @@ manipulation of DNS zones, messages, names, and records.
|
|||
|
||||
%prep
|
||||
%setup0 -q -n dnspython-%{version}
|
||||
%patch0 -p1
|
||||
|
||||
# strip executable permissions so that we don't pick up dependencies
|
||||
# from documentation
|
||||
|
|
@ -64,6 +67,51 @@ rm -rf %{buildroot}
|
|||
%{python_sitelib}/dns
|
||||
|
||||
%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
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
|
||||
|
||||
* Wed Jan 27 2010 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.8.0-1.1
|
||||
- Fix error
|
||||
|
||||
* Wed Jan 27 2010 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.8.0-1
|
||||
- New since 1.7.1:
|
||||
-
|
||||
- Support for hmac-sha1, hmac-sha224, hmac-sha256, hmac-sha384 and
|
||||
- hmac-sha512 has been contributed by Kevin Chen.
|
||||
-
|
||||
- The tokenizer's tokens are now Token objects instead of (type,
|
||||
- value) tuples.
|
||||
-
|
||||
- Bugs fixed since 1.7.1:
|
||||
-
|
||||
- Escapes in masterfiles now work correctly. Previously they were
|
||||
- only working correctly when the text involved was part of a domain
|
||||
- name.
|
||||
-
|
||||
- When constructing a DDNS update, if the present() method was used
|
||||
- with a single rdata, a zero TTL was not added.
|
||||
-
|
||||
- The entropy pool needed locking to be thread safe.
|
||||
-
|
||||
- The entropy pool's reading of /dev/random could cause dnspython to
|
||||
- block.
|
||||
-
|
||||
- The entropy pool did buffered reads, potentially consuming more
|
||||
- randomness than we needed.
|
||||
-
|
||||
- The entropy pool did not seed with high quality randomness on
|
||||
- Windows.
|
||||
-
|
||||
- SRV records were compared incorrectly.
|
||||
-
|
||||
- In the e164 query function, the resolver parameter was not used.
|
||||
|
||||
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
||||
|
||||
* Fri Jun 19 2009 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.7.1-1
|
||||
- New since 1.7.0:
|
||||
-
|
||||
|
|
|
|||
Loading…
Reference in New Issue