From 935edb4d2a2059651b10264b20ba2b9ac4d149dd Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Thu, 11 Jan 2007 16:35:56 +0000 Subject: [PATCH 01/15] Update to 1.5.0 --- .cvsignore | 2 +- python-dns.spec | 10 ++++++++-- sources | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 2e5c05a..9264e57 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -dnspython-1.4.0.tar.gz +dnspython-1.5.0.tar.gz diff --git a/python-dns.spec b/python-dns.spec index beb9419..a46419a 100644 --- a/python-dns.spec +++ b/python-dns.spec @@ -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.4.0 -Release: 2%{?dist} +Version: 1.5.0 +Release: 1%{?dist} Summary: DNS toolkit for Python Group: Development/Languages @@ -59,6 +59,12 @@ rm -rf %{buildroot} %{python_sitelib}/dns %changelog +* Thu Jan 11 2007 Jeffrey C. Ollie - 1.5.0-1 +- Update to 1.5.0 + +* Fri Dec 8 2006 Jeffrey C. Ollie - 1.4.0-3 +- Bump release for rebuild with Python 2.5 + * Mon Aug 14 2006 Jeffrey C. Ollie - 1.4.0-2 - No longer ghost *.pyo files, thus further simplifying the files section. diff --git a/sources b/sources index 2619f31..9ccc812 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7f7e58379235b2b626620a7bda810270 dnspython-1.4.0.tar.gz +8b9bfb32988d03e49cdf8b3de7c7e6df dnspython-1.5.0.tar.gz From 0aab31e1b7ed0cbf9c8cac39f7ec9bd969c526da Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Wed, 19 Nov 2008 03:51:33 +0000 Subject: [PATCH 02/15] Initialize branch EL-5 for python-dns --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..42f697a --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-5 From 7ea50ab44c878eaccbf4206c4db751fc99655099 Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Wed, 19 Nov 2008 12:42:54 +0000 Subject: [PATCH 03/15] - fix license tag --- .cvsignore | 2 +- python-dns.spec | 26 ++++++++++++++++++++------ sources | 2 +- 3 files changed, 22 insertions(+), 8 deletions(-) diff --git a/.cvsignore b/.cvsignore index 9264e57..7ba8dce 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -dnspython-1.5.0.tar.gz +dnspython-1.6.0.tar.gz diff --git a/python-dns.spec b/python-dns.spec index a46419a..b27571d 100644 --- a/python-dns.spec +++ b/python-dns.spec @@ -1,18 +1,22 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-dns -Version: 1.5.0 -Release: 1%{?dist} +Version: 1.6.0 +Release: 2%{?dist} Summary: DNS toolkit for Python Group: Development/Languages -License: BSD-like +License: MIT URL: http://www.dnspython.org/ Source0: http://www.dnspython.org/kits/%{version}/dnspython-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: python-devel +%if 0%{?fedora} >= 8 +BuildRequires: python-setuptools-devel +%else +BuildRequires: python-setuptools +%endif %description dnspython is a DNS toolkit for Python. It supports almost all record @@ -32,11 +36,11 @@ manipulation of DNS zones, messages, names, and records. find examples -type f | xargs chmod a-x %build -CFLAGS="%{optflags}" %{__python} setup.py build +CFLAGS="%{optflags}" %{__python} -c 'import setuptools; execfile("setup.py")' build %install rm -rf %{buildroot} -%{__python} setup.py install -O1 --skip-build --root %{buildroot} +%{__python} -c 'import setuptools; execfile("setup.py")' install --skip-build --root %{buildroot} %check pushd tests @@ -56,9 +60,19 @@ rm -rf %{buildroot} %defattr(-,root,root,-) %doc ChangeLog LICENSE README TODO examples +%{python_sitelib}/*egg-info %{python_sitelib}/dns %changelog +* Fri Aug 29 2008 Tom "spot" Callaway - 1.6.0-2 +- fix license tag + +* Sat Dec 4 2007 Jeffrey C. Ollie - 1.6.0-1 +- Update to 1.6.0 + +* Tue Oct 9 2007 Jeffrey C. Ollie - 1.5.0-2 +- Follow new Python egg packaging specs + * Thu Jan 11 2007 Jeffrey C. Ollie - 1.5.0-1 - Update to 1.5.0 diff --git a/sources b/sources index 9ccc812..6fce215 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8b9bfb32988d03e49cdf8b3de7c7e6df dnspython-1.5.0.tar.gz +15b8eed42689bd719ec1878a584787ea dnspython-1.6.0.tar.gz From 89705f8f3f960df1150089bd3d5d2706908ff2a0 Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Fri, 19 Jun 2009 16:30:16 +0000 Subject: [PATCH 04/15] - New since 1.7.0: - - Nothing - - Bugs fixed since 1.7.0: - - The 1.7.0 kitting process inadventently omitted the code for the - DLV RR. - - Negative DDNS prerequisites are now handled correctly. --- .cvsignore | 2 +- python-dns.spec | 67 ++++++++++++++++++++++++++++++++++++++++++++++--- sources | 2 +- 3 files changed, 66 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 7ba8dce..99674cc 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -dnspython-1.6.0.tar.gz +dnspython-1.7.1.tar.gz diff --git a/python-dns.spec b/python-dns.spec index b27571d..222141f 100644 --- a/python-dns.spec +++ b/python-dns.spec @@ -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.6.0 -Release: 2%{?dist} +Version: 1.7.1 +Release: 1%{?dist} Summary: DNS toolkit for Python Group: Development/Languages @@ -29,7 +29,7 @@ class, and return an answer set. The low level classes allow direct manipulation of DNS zones, messages, names, and records. %prep -%setup -q -n dnspython-%{version} +%setup0 -q -n dnspython-%{version} # strip executable permissions so that we don't pick up dependencies # from documentation @@ -64,6 +64,67 @@ rm -rf %{buildroot} %{python_sitelib}/dns %changelog +* Fri Jun 19 2009 Jeffrey C. Ollie - 1.7.1-1 +- New since 1.7.0: +- +- Nothing +- +- Bugs fixed since 1.7.0: +- +- The 1.7.0 kitting process inadventently omitted the code for the +- DLV RR. +- +- Negative DDNS prerequisites are now handled correctly. + +* Fri Jun 19 2009 Jeffrey C. Ollie - 1.7.0-1 +- New since 1.6.0: +- +- Rdatas now have a to_digestable() method, which returns the +- DNSSEC canonical form of the rdata, suitable for use in +- signature computations. +- +- The NSEC3, NSEC3PARAM, DLV, and HIP RR types are now supported. +- +- An entropy module has been added and is used to randomize query ids. +- +- EDNS0 options are now supported. +- +- UDP IXFR is now supported. +- +- The wire format parser now has a 'one_rr_per_rrset' mode, which +- suppresses the usual coalescing of all RRs of a given type into a +- single RRset. +- +- Various helpful DNSSEC-related constants are now defined. +- +- The resolver's query() method now has an optional 'source' parameter, +- allowing the source IP address to be specified. +- +- Bugs fixed since 1.6.0: +- +- On Windows, the resolver set the domain incorrectly. +- +- DS RR parsing only allowed one Base64 chunk. +- +- TSIG validation didn't always use absolute names. +- +- NSEC.to_text() only printed the last window. +- +- We did not canonicalize IPv6 addresses before comparing them; we +- would thus treat equivalent but different textual forms, e.g. +- "1:00::1" and "1::1" as being non-equivalent. +- +- If the peer set a TSIG error, we didn't raise an exception. +- +- Some EDNS bugs in the message code have been fixed (see the ChangeLog +- for details). + +* Thu Feb 26 2009 Fedora Release Engineering - 1.6.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Sat Nov 29 2008 Jeffrey C. Ollie - 1.6.0-3 +- Rebuild for Python 2.6 + * Fri Aug 29 2008 Tom "spot" Callaway - 1.6.0-2 - fix license tag diff --git a/sources b/sources index 6fce215..0f8507d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -15b8eed42689bd719ec1878a584787ea dnspython-1.6.0.tar.gz +870f52ca78b4f37ac7a4e718d337334c dnspython-1.7.1.tar.gz From dba599bb64211a99b0a04abc925920dd4188454e Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:51:12 +0000 Subject: [PATCH 05/15] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c8f0072..657ea7a 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := python-dns SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 374a3ff6948a0fe5195935a8c1cdb76d3a8d3fbb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 10:18:02 +0000 Subject: [PATCH 06/15] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 657ea7a..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: python-dns -# $Id$ -NAME := python-dns -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 42f697a..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-5 From 5409f8113c0b21b59e91ef8f6ceb78d0790f6007 Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Mon, 22 Nov 2010 08:20:08 -0600 Subject: [PATCH 07/15] - 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. --- .gitignore | 2 + ...hm-was-being-passed-to-use_tsig-inco.patch | 36 ------------- python-dns.spec | 52 +++++++++++++++++-- sources | 4 +- 4 files changed, 52 insertions(+), 42 deletions(-) delete mode 100644 0001-The-TSIG-algorithm-was-being-passed-to-use_tsig-inco.patch diff --git a/.gitignore b/.gitignore index f591382..41c36b8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ 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 diff --git a/0001-The-TSIG-algorithm-was-being-passed-to-use_tsig-inco.patch b/0001-The-TSIG-algorithm-was-being-passed-to-use_tsig-inco.patch deleted file mode 100644 index 9e300a4..0000000 --- a/0001-The-TSIG-algorithm-was-being-passed-to-use_tsig-inco.patch +++ /dev/null @@ -1,36 +0,0 @@ -From e80c56c6c5c6dd7aa12c439b1f3b664811f65dcb Mon Sep 17 00:00:00 2001 -From: Bob Halley -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 - diff --git a/python-dns.spec b/python-dns.spec index 222877f..9693e9f 100644 --- a/python-dns.spec +++ b/python-dns.spec @@ -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.1 +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,52 @@ rm -rf %{buildroot} %{python_sitelib}/dns %changelog +* Mon Nov 22 2010 Jeffrey C. Ollie - 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 - 1.8.0-3 - Add a patch from upstream to fix a Python 2.7 issue. diff --git a/sources b/sources index 803a35f..95de856 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -77f379e0cb21e11470a35359e6211c53 dnspython-1.8.0.tar.gz -7234413d2cddf2ab1eb54bcf82e4f8bd dnspython-1.8.0.tar.gz.asc +d11f8618b08a9fdc94413cbf034dc5c1 dnspython-1.9.1.tar.gz +9f532a9dbfb7fff7f73d28ceceb3b255 dnspython-1.9.1.tar.gz.asc From dabb91e73d2b068c1bc71354aa1a330c56662457 Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Tue, 23 Nov 2010 06:50:04 -0600 Subject: [PATCH 08/15] - 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! --- .gitignore | 2 ++ python-dns.spec | 11 ++++++++++- sources | 4 ++-- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 41c36b8..41ac7bb 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ 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 diff --git a/python-dns.spec b/python-dns.spec index 9693e9f..db6dedf 100644 --- a/python-dns.spec +++ b/python-dns.spec @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-dns -Version: 1.9.1 +Version: 1.9.2 Release: 1%{?dist} Summary: DNS toolkit for Python @@ -65,6 +65,15 @@ rm -rf %{buildroot} %{python_sitelib}/dns %changelog +* Tue Nov 23 2010 Jeffrey C. Ollie - 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 - 1.9.1-1 - New since 1.9.0: - diff --git a/sources b/sources index 95de856..5047785 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -d11f8618b08a9fdc94413cbf034dc5c1 dnspython-1.9.1.tar.gz -9f532a9dbfb7fff7f73d28ceceb3b255 dnspython-1.9.1.tar.gz.asc +26426043e619d34b47c7c30dc0a02f1c dnspython-1.9.2.tar.gz +589f4e0e3221190b2c67b1ef3e1e235f dnspython-1.9.2.tar.gz.asc From 2cd4f437e5f733b85cce1982eb367ea2ac76b05a Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Thu, 2 Dec 2010 10:23:46 -0600 Subject: [PATCH 09/15] - Build Python 2.6 subpackage for EPEL 5 --- python-dns.spec | 83 ++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 78 insertions(+), 5 deletions(-) diff --git a/python-dns.spec b/python-dns.spec index db6dedf..89b0103 100644 --- a/python-dns.spec +++ b/python-dns.spec @@ -1,8 +1,18 @@ -%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5) +%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} +%endif + +%if 0%{?rhel} == 5 +%global with_python26 1 +%{!?py26dir: %global py26dir %{_builddir}/python26-%{name}-%{version}-%{release}} +%{!?__python26: %global __python26 /usr/bin/python26} +%{!?python26_sitelib: %global python26_sitelib %(%{__python26} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%endif + Name: python-dns Version: 1.9.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: DNS toolkit for Python Group: Development/Languages @@ -13,10 +23,15 @@ Source1: http://www.dnspython.org/kits/%{version}/dnspython-%{version}.ta BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -%if 0%{?fedora} >= 8 -BuildRequires: python-setuptools-devel +BuildRequires: python-devel +%if 0%{?fedora} > 8 +BuildRequires: python-setuptools-devel %else -BuildRequires: python-setuptools +BuildRequires: python-setuptools +%endif + +%if 0%{?with_python26} +BuildRequires: python26-devel %endif %description @@ -29,6 +44,22 @@ level classes perform queries for data of a given name, type, and class, and return an answer set. The low level classes allow direct manipulation of DNS zones, messages, names, and records. +%if 0%{?with_python26} +%package -n python26-dns +Summary: DNS toolkit for Python 2.6 +Group: Development/Languages + +%description -n python26-dns +dnspython is a DNS toolkit for Python. It supports almost all record +types. It can be used for queries, zone transfers, and dynamic +updates. It supports TSIG authenticated messages and EDNS0. + +dnspython provides both high and low level access to DNS. The high +level classes perform queries for data of a given name, type, and +class, and return an answer set. The low level classes allow direct +manipulation of DNS zones, messages, names, and records. +%endif + %prep %setup0 -q -n dnspython-%{version} @@ -36,13 +67,31 @@ manipulation of DNS zones, messages, names, and records. # from documentation find examples -type f | xargs chmod a-x +%if 0%{?with_python26} +rm -rf %{py26dir} +cp -a . %{py26dir} +find %{py26dir} -name '*.py' | xargs sed -i '1s|^#!.*python|#!%{__python26}|' +%endif + %build CFLAGS="%{optflags}" %{__python} -c 'import setuptools; execfile("setup.py")' build +%if 0%{?with_python26} +pushd %{py26dir} +CFLAGS="%{optflags}" %{__python26} setup.py build +popd +%endif + %install rm -rf %{buildroot} %{__python} -c 'import setuptools; execfile("setup.py")' install --skip-build --root %{buildroot} +%if 0%{?with_python26} +pushd %{py26dir} +CFLAGS="%{optflags}" %{__python26} setup.py install --skip-build --root %{buildroot} +popd +%endif + %check pushd tests # skip one test because it queries the network @@ -54,6 +103,18 @@ do fi done +%if 0%{?with_python26} +pushd %{py26dir}/tests +# skip one test because it queries the network +for py in *.py +do + if [ $py != resolver.py ] + then + PYTHONPATH=%{buildroot}%{python26_sitelib} %{__python26} $py + fi +done +%endif + %clean rm -rf %{buildroot} @@ -64,7 +125,19 @@ rm -rf %{buildroot} %{python_sitelib}/*egg-info %{python_sitelib}/dns +%if 0%{?with_python26} +%files -n python26-dns +%defattr(-,root,root,-) +%doc ChangeLog LICENSE README TODO examples + +%{python26_sitelib}/*egg-info +%{python26_sitelib}/dns +%endif + %changelog +* Thu Dec 2 2010 Jeffrey C. Ollie - 1.9.2-2 +- Build Python 2.6 subpackage for EPEL 5 + * Tue Nov 23 2010 Jeffrey C. Ollie - 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 From 8900f66cfacc492e7150973f1c5c8021b0adaac4 Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Thu, 2 Dec 2010 12:36:58 -0600 Subject: [PATCH 10/15] Get rid of mac files --- python-dns.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/python-dns.spec b/python-dns.spec index 89b0103..7ec3456 100644 --- a/python-dns.spec +++ b/python-dns.spec @@ -63,6 +63,9 @@ manipulation of DNS zones, messages, names, and records. %prep %setup0 -q -n dnspython-%{version} +# get rid of Mac goop +find . -name ._\* -delete + # strip executable permissions so that we don't pick up dependencies # from documentation find examples -type f | xargs chmod a-x From 678e42cdf03056fdf8c40a17fac11b951b38d1ad Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Thu, 2 Dec 2010 14:06:19 -0600 Subject: [PATCH 11/15] Don't fail on older versions of python because of buggy hashlib --- ...der-python-versions-because-of-hashe.patch | 26 +++++++++++++++++++ python-dns.spec | 7 +++++ 2 files changed, 33 insertions(+) create mode 100644 0001-Don-t-fail-on-older-python-versions-because-of-hashe.patch diff --git a/0001-Don-t-fail-on-older-python-versions-because-of-hashe.patch b/0001-Don-t-fail-on-older-python-versions-because-of-hashe.patch new file mode 100644 index 0000000..d50bd54 --- /dev/null +++ b/0001-Don-t-fail-on-older-python-versions-because-of-hashe.patch @@ -0,0 +1,26 @@ +From f6f6666438af884da7b4b1d76a258639f949406f Mon Sep 17 00:00:00 2001 +From: Jeffrey C. Ollie +Date: Thu, 2 Dec 2010 13:05:50 -0600 +Subject: [PATCH] Don't fail on older python versions because of hashes. + +--- + dns/hash.py | 3 --- + 1 files changed, 0 insertions(+), 3 deletions(-) + +diff --git a/dns/hash.py b/dns/hash.py +index 7bd5ae5..8582a9c 100644 +--- a/dns/hash.py ++++ b/dns/hash.py +@@ -37,9 +37,6 @@ def _setup(): + if sys.hexversion >= 0x02050200: + _hashes['SHA384'] = hashlib.sha384 + _hashes['SHA512'] = hashlib.sha512 +- else: +- _hashes['SHA384'] = _need_later_python('SHA384') +- _hashes['SHA512'] = _need_later_python('SHA512') + + if sys.hexversion < 0x02050000: + # hashlib doesn't conform to PEP 247: API for +-- +1.7.3.2 + diff --git a/python-dns.spec b/python-dns.spec index 7ec3456..e6fac2b 100644 --- a/python-dns.spec +++ b/python-dns.spec @@ -20,6 +20,9 @@ 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 +%if 0%{?rhel} == 5 +Patch0: 0001-Don-t-fail-on-older-python-versions-because-of-hashe.patch +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -76,6 +79,10 @@ cp -a . %{py26dir} find %{py26dir} -name '*.py' | xargs sed -i '1s|^#!.*python|#!%{__python26}|' %endif +%if 0%{?rhel} == 5 +%patch0 -p1 +%endif + %build CFLAGS="%{optflags}" %{__python} -c 'import setuptools; execfile("setup.py")' build From 1799f36ef21ec8e6507b799a8825506af46a010e Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 8 Feb 2011 21:35:37 -0600 Subject: [PATCH 12/15] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- python-dns.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-dns.spec b/python-dns.spec index db6dedf..4158ec4 100644 --- a/python-dns.spec +++ b/python-dns.spec @@ -2,7 +2,7 @@ Name: python-dns Version: 1.9.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: DNS toolkit for Python Group: Development/Languages @@ -65,6 +65,9 @@ rm -rf %{buildroot} %{python_sitelib}/dns %changelog +* Tue Feb 08 2011 Fedora Release Engineering - 1.9.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Tue Nov 23 2010 Jeffrey C. Ollie - 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 From ccf26cb913fb0e3ce1cbf9e34fc93439ac4016df Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Fri, 25 Mar 2011 12:51:29 -0500 Subject: [PATCH 13/15] whitespace fixes --- python-dns.spec | 62 ++++++++++++++++++++++++------------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/python-dns.spec b/python-dns.spec index 4158ec4..82bf339 100644 --- a/python-dns.spec +++ b/python-dns.spec @@ -134,35 +134,35 @@ rm -rf %{buildroot} * Wed Jan 27 2010 Jeffrey C. Ollie - 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 - 1.7.1-2 @@ -170,56 +170,56 @@ rm -rf %{buildroot} * Fri Jun 19 2009 Jeffrey C. Ollie - 1.7.1-1 - New since 1.7.0: -- +- - Nothing -- +- - Bugs fixed since 1.7.0: -- +- - The 1.7.0 kitting process inadventently omitted the code for the - DLV RR. -- +- - Negative DDNS prerequisites are now handled correctly. * Fri Jun 19 2009 Jeffrey C. Ollie - 1.7.0-1 - New since 1.6.0: -- +- - Rdatas now have a to_digestable() method, which returns the - DNSSEC canonical form of the rdata, suitable for use in - signature computations. -- +- - The NSEC3, NSEC3PARAM, DLV, and HIP RR types are now supported. -- +- - An entropy module has been added and is used to randomize query ids. -- +- - EDNS0 options are now supported. -- +- - UDP IXFR is now supported. -- +- - The wire format parser now has a 'one_rr_per_rrset' mode, which - suppresses the usual coalescing of all RRs of a given type into a - single RRset. -- +- - Various helpful DNSSEC-related constants are now defined. -- +- - The resolver's query() method now has an optional 'source' parameter, - allowing the source IP address to be specified. -- +- - Bugs fixed since 1.6.0: -- +- - On Windows, the resolver set the domain incorrectly. -- +- - DS RR parsing only allowed one Base64 chunk. -- +- - TSIG validation didn't always use absolute names. -- +- - NSEC.to_text() only printed the last window. -- +- - We did not canonicalize IPv6 addresses before comparing them; we - would thus treat equivalent but different textual forms, e.g. - "1:00::1" and "1::1" as being non-equivalent. -- +- - If the peer set a TSIG error, we didn't raise an exception. -- +- - Some EDNS bugs in the message code have been fixed (see the ChangeLog - for details). From d49f211e7c7dcb83514ffdf88b9346b0f527ed86 Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Fri, 25 Mar 2011 12:51:56 -0500 Subject: [PATCH 14/15] 1.9.3 --- .gitignore | 2 ++ python-dns.spec | 28 ++++++++++++++++++++++++++-- sources | 4 ++-- 3 files changed, 30 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 41ac7bb..856adfe 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,5 @@ dnspython-1.8.0.tar.gz.asc /dnspython-1.9.1.tar.gz.asc /dnspython-1.9.2.tar.gz /dnspython-1.9.2.tar.gz.asc +/dnspython-1.9.3.tar.gz +/dnspython-1.9.3.tar.gz.asc diff --git a/python-dns.spec b/python-dns.spec index 82bf339..50a5680 100644 --- a/python-dns.spec +++ b/python-dns.spec @@ -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.9.2 -Release: 2%{?dist} +Version: 1.9.3 +Release: 1%{?dist} Summary: DNS toolkit for Python Group: Development/Languages @@ -65,6 +65,30 @@ rm -rf %{buildroot} %{python_sitelib}/dns %changelog +* Fri Mar 25 2011 Jeffrey C. Ollie - 1.9.3-1 +- +- New since 1.9.2: +- +- A boolean parameter, 'raise_on_no_answer', has been added to +- the query() methods. In no-error, no-data situations, this +- parameter determines whether NoAnswer should be raised or not. +- If True, NoAnswer is raised. If False, then an Answer() +- object with a None rrset will be returned. +- +- Resolver Answer() objects now have a canonical_name field. +- +- Rdata now have a __hash__ method. +- +- Bugs fixed since 1.9.2: +- +- Dnspython was erroneously doing case-insensitive comparisons +- of the names in NSEC and RRSIG RRs. +- +- We now use "is" and not "==" when testing what section an RR +- is in. +- +- The resolver now disallows metaqueries. + * Tue Feb 08 2011 Fedora Release Engineering - 1.9.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index 5047785..b70fa1b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -26426043e619d34b47c7c30dc0a02f1c dnspython-1.9.2.tar.gz -589f4e0e3221190b2c67b1ef3e1e235f dnspython-1.9.2.tar.gz.asc +93e37366efb5bf5f5fae80ab3e840340 dnspython-1.9.3.tar.gz +35548866a0090e153e8c715ef7ae60f5 dnspython-1.9.3.tar.gz.asc From 7806d2395d38bbf5ef08b43ff0cbf8899f48aa16 Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Mon, 28 Mar 2011 08:49:08 -0500 Subject: [PATCH 15/15] 1.9.4 --- .gitignore | 2 ++ python-dns.spec | 13 ++++++++++++- sources | 4 ++-- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 856adfe..a0a7207 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,5 @@ dnspython-1.8.0.tar.gz.asc /dnspython-1.9.2.tar.gz.asc /dnspython-1.9.3.tar.gz /dnspython-1.9.3.tar.gz.asc +/dnspython-1.9.4.tar.gz +/dnspython-1.9.4.tar.gz.asc diff --git a/python-dns.spec b/python-dns.spec index 50a5680..cca99fd 100644 --- a/python-dns.spec +++ b/python-dns.spec @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-dns -Version: 1.9.3 +Version: 1.9.4 Release: 1%{?dist} Summary: DNS toolkit for Python @@ -65,6 +65,17 @@ rm -rf %{buildroot} %{python_sitelib}/dns %changelog +* Mon Mar 28 2011 Jeffrey C. Ollie - 1.9.4-1 +- +- dnspython 1.9.4 has been released and is available at +- http://www.dnspython.org/kits/1.9.4/ +- +- There is no new functionality in this release; just a few bug fixes +- in RRSIG and SIG code. +- +- I will be eliminating legacy code for earlier versions of DNSSEC in a +- future release of dnspython. + * Fri Mar 25 2011 Jeffrey C. Ollie - 1.9.3-1 - - New since 1.9.2: diff --git a/sources b/sources index b70fa1b..9834fae 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -93e37366efb5bf5f5fae80ab3e840340 dnspython-1.9.3.tar.gz -35548866a0090e153e8c715ef7ae60f5 dnspython-1.9.3.tar.gz.asc +8a89b7865251c4e9d8ec2f8cc9f8cd78 dnspython-1.9.4.tar.gz +413d7fc295c6bf03f872938731919c95 dnspython-1.9.4.tar.gz.asc