From 2206c4fe0f9f98587e7113e8453145d61bdc4653 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:31:54 +0000 Subject: [PATCH 1/6] 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 2a756ca254add7fdf70ddf520d3892081475444d Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Wed, 27 Jan 2010 06:11:51 +0000 Subject: [PATCH 2/6] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- .cvsignore | 3 ++- python-dns.spec | 5 +++-- sources | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 99674cc..f591382 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ -dnspython-1.7.1.tar.gz +dnspython-1.8.0.tar.gz +dnspython-1.8.0.tar.gz.asc diff --git a/python-dns.spec b/python-dns.spec index 12f5f6e..6262cb1 100644 --- a/python-dns.spec +++ b/python-dns.spec @@ -1,14 +1,15 @@ %{!?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: 2%{?dist} +Version: 1.8.0 +Release: 1%{?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 +Source0: http://www.dnspython.org/kits/%{version}/dnspython-%{version}.tar.gz.asc BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch diff --git a/sources b/sources index 0f8507d..803a35f 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -870f52ca78b4f37ac7a4e718d337334c dnspython-1.7.1.tar.gz +77f379e0cb21e11470a35359e6211c53 dnspython-1.8.0.tar.gz +7234413d2cddf2ab1eb54bcf82e4f8bd dnspython-1.8.0.tar.gz.asc From a9675a970b1fbb0c825a96a091500295d19685ea Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Wed, 27 Jan 2010 06:40:16 +0000 Subject: [PATCH 3/6] - Fix error --- python-dns.spec | 40 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/python-dns.spec b/python-dns.spec index 6262cb1..46fc86a 100644 --- a/python-dns.spec +++ b/python-dns.spec @@ -2,14 +2,14 @@ Name: python-dns Version: 1.8.0 -Release: 1%{?dist} +Release: 1.1%{?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 -Source0: http://www.dnspython.org/kits/%{version}/dnspython-%{version}.tar.gz.asc +Source1: http://www.dnspython.org/kits/%{version}/dnspython-%{version}.tar.gz.asc BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -65,6 +65,42 @@ rm -rf %{buildroot} %{python_sitelib}/dns %changelog +* Wed Jan 27 2010 Jeffrey C. Ollie - 1.8.0-1.1 +- Fix error + +* 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 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From 00b06723ab2d5b568e9784a94a7335e108d30a93 Mon Sep 17 00:00:00 2001 From: dmalcolm Date: Thu, 22 Jul 2010 04:08:45 +0000 Subject: [PATCH 4/6] - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild --- python-dns.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-dns.spec b/python-dns.spec index 46fc86a..05db834 100644 --- a/python-dns.spec +++ b/python-dns.spec @@ -2,7 +2,7 @@ Name: python-dns Version: 1.8.0 -Release: 1.1%{?dist} +Release: 2.1%{?dist} Summary: DNS toolkit for Python Group: Development/Languages @@ -65,6 +65,9 @@ rm -rf %{buildroot} %{python_sitelib}/dns %changelog +* Thu Jul 22 2010 David Malcolm - 1.8.0-2.1 +- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild + * Wed Jan 27 2010 Jeffrey C. Ollie - 1.8.0-1.1 - Fix error From f2cd60f792f3e4288fbcde54bdcb54328ae5bdbf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 10:18:03 +0000 Subject: [PATCH 5/6] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile 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) From 5a0206fd8334016fe701380ca06ef658d8998281 Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Fri, 13 Aug 2010 12:04:20 -0500 Subject: [PATCH 6/6] - Add a patch from upstream to fix a Python 2.7 issue. --- ...hm-was-being-passed-to-use_tsig-inco.patch | 36 +++++++++++++++++++ python-dns.spec | 7 +++- 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 0001-The-TSIG-algorithm-was-being-passed-to-use_tsig-inco.patch 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 new file mode 100644 index 0000000..9e300a4 --- /dev/null +++ b/0001-The-TSIG-algorithm-was-being-passed-to-use_tsig-inco.patch @@ -0,0 +1,36 @@ +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 05db834..222877f 100644 --- a/python-dns.spec +++ b/python-dns.spec @@ -2,7 +2,7 @@ Name: python-dns Version: 1.8.0 -Release: 2.1%{?dist} +Release: 3%{?dist} Summary: DNS toolkit for Python Group: Development/Languages @@ -10,6 +10,7 @@ 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 @@ -31,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 @@ -65,6 +67,9 @@ rm -rf %{buildroot} %{python_sitelib}/dns %changelog +* Fri Aug 13 2010 Jeffrey C. Ollie - 1.8.0-3 +- Add a patch from upstream to fix a Python 2.7 issue. + * Thu Jul 22 2010 David Malcolm - 1.8.0-2.1 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild