Merge remote branch 'origin/master' into el5
This commit is contained in:
Jeffrey C. Ollie
commit
0a006699a2
4
.gitignore
vendored
4
.gitignore
vendored
@ -1,2 +1,6 @@
|
||||
dnspython-1.8.0.tar.gz
|
||||
dnspython-1.8.0.tar.gz.asc
|
||||
/dnspython-1.9.1.tar.gz
|
||||
/dnspython-1.9.1.tar.gz.asc
|
||||
/dnspython-1.9.2.tar.gz
|
||||
/dnspython-1.9.2.tar.gz.asc
|
||||
|
||||
@ -1,36 +0,0 @@
|
||||
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,8 +1,8 @@
|
||||
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
|
||||
|
||||
Name: python-dns
|
||||
Version: 1.8.0
|
||||
Release: 3%{?dist}
|
||||
Version: 1.9.2
|
||||
Release: 1%{?dist}
|
||||
Summary: DNS toolkit for Python
|
||||
|
||||
Group: Development/Languages
|
||||
@ -10,7 +10,6 @@ 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
|
||||
@ -32,7 +31,6 @@ 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
|
||||
@ -67,6 +65,61 @@ rm -rf %{buildroot}
|
||||
%{python_sitelib}/dns
|
||||
|
||||
%changelog
|
||||
* Tue Nov 23 2010 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.9.2-1
|
||||
- It's brown paper bag time :) The fix for the import problems was
|
||||
- actually bad, but didn't show up in testing because the test suite's
|
||||
- conditional importing code hid the problem.
|
||||
-
|
||||
- Any, 1.9.2 is out.
|
||||
-
|
||||
- Sorry for the churn!
|
||||
|
||||
* Mon Nov 22 2010 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.9.1-1
|
||||
- New since 1.9.0:
|
||||
-
|
||||
- Nothing.
|
||||
-
|
||||
- Bugs fixed since 1.9.0
|
||||
-
|
||||
- The dns.dnssec module didn't work with DSA due to namespace
|
||||
- contamination from a "from"-style import.
|
||||
-
|
||||
- New since 1.8.0:
|
||||
-
|
||||
- dnspython now uses poll() instead of select() when available.
|
||||
-
|
||||
- Basic DNSSEC validation can be done using dns.dnsec.validate()
|
||||
- and dns.dnssec.validate_rrsig() if you have PyCrypto 2.3 or
|
||||
- later installed. Complete secure resolution is not yet
|
||||
- available.
|
||||
-
|
||||
- Added key_id() to the DNSSEC module, which computes the DNSSEC
|
||||
- key id of a DNSKEY rdata.
|
||||
-
|
||||
- Added make_ds() to the DNSSEC module, which returns the DS RR
|
||||
- for a given DNSKEY rdata.
|
||||
-
|
||||
- dnspython now raises an exception if HMAC-SHA284 or
|
||||
- HMAC-SHA512 are used with a Python older than 2.5.2. (Older
|
||||
- Pythons do not compute the correct value.)
|
||||
-
|
||||
- Symbolic constants are now available for TSIG algorithm names.
|
||||
-
|
||||
- Bugs fixed since 1.8.0
|
||||
-
|
||||
- dns.resolver.zone_for_name() didn't handle a query response
|
||||
- with a CNAME or DNAME correctly in some cases.
|
||||
-
|
||||
- When specifying rdata types and classes as text, Unicode
|
||||
- strings may now be used.
|
||||
-
|
||||
- Hashlib compatibility issues have been fixed.
|
||||
-
|
||||
- dns.message now imports dns.edns.
|
||||
-
|
||||
- The TSIG algorithm value was passed incorrectly to use_tsig()
|
||||
- in some cases.
|
||||
|
||||
* 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.
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user