Update to 1.11.1:

	* (Version 1.11.1 released)

	* dns/tsigkeyring.py (to_text): we want keyname.to_text(), not
	  dns.name.to_text(keyname).  Thangs to wangwang for the fix.

	* dns/tsig.py (sign): multi-message TSIGs were broken for
	  algorithms other than HMAC-MD5 because we weren't passing the
	  right digest module to the HMAC code.  Thanks to salzmdan for
	  reporting the bug.

	* dns/dnssec.py (_find_candidate_keys): we tried to extract the
	  key from the wrong variable name.  Thanks to Andrei Fokau for the
	  fix.

	* dns/resolver.py: we want 'self.retry_servfail' not just
	  retry_servfail.  Reported by many, thanks!  Thanks to
	  Jeffrey C. Ollie for the fix.

	* tests/grange.py: fix tests to use older-style print formatting
	  for backwards compatibility with python 2.4.  Thanks to
	  Jeffrey C. Ollie for the fix.

	* (Version 1.11.0 released)

	* dns/name.py (Name.to_wire): Do not add items with offsets >= 2^14
	  to the compression table.  Thanks to Casey Deccio for discovering
	  this bug.

	* dns/ipv6.py (inet_ntoa): We now comply with RFC 5952 section
	  5.2.2, by *not* using the :: syntax to shorten just one 16-bit
	  field.  Thanks to David Waitzman for reporting the bug and
	  suggesting the fix.

	* lock caches in case they are shared

	* raise YXDOMAIN if we see one

	* do not print empty rdatasets

	* Add contributed $GENERATE support (thanks uberj)

	* Remove DNSKEY keytag uniqueness assumption (RFC 4034, section 8)
	  (thanks James Dempsey)

	* added set_flags() method to dns.resolver.Resolver

	* added support for TLSA RR

	* dns/rdtypes/ANY/NSEC3.py (NSEC3.from_text): The NSEC3 from_text()
	  method could erroneously emit empty bitmap windows (i.e. windows
	  with a count of 0 bytes); such bitmaps are illegal.

	* (Version 1.10.0 released)

	* dns/message.py (make_query): All EDNS values may now be
	  specified when calling make_query()

	* dns/query.py: Specifying source_port had no effect if source was
	  not specified.  We now use the appropriate wildcard source in
	  that case.

	* dns/resolver.py (Resolver.query): source_port may now be
	  specified.

	* dns/resolver.py (Resolver.query): Switch to TCP when a UDP
	  response is truncated.  Handle nameservers that serve on UDP
	  but not TCP.

	* dns/zone.py (from_xfr): dns.zone.from_xfr() now takes a
	  'check_origin' parameter which defaults to True.  If set to
	  False, then dnspython will not make origin checks on the zone.
	  Thanks to Carlos Perez for the report.

	* dns/rdtypes/ANY/SSHFP.py (SSHFP.from_text): Allow whitespace in
	  the text string.  Thanks to Jan Andres for the report and the
	  patch.

	* dns/message.py (from_wire): dns.message.from_wire() now takes
	  an 'ignore_trailing' parameter which defaults to False.  If set
	  to True, then trailing junk will be ignored instead of causing
	  TrailingJunk to be raised.  Thanks to Shane Huntley for
	  contributing the patch.

	* dns/resolver.py: Added LRUCache.  In this cache implementation,
	  the cache size is limited to a user-specified number of nodes, and
	  when adding a new node to a full cache the least-recently used
	  node is removed.

	* dns/resolver.py: dns.resolver.override_system_resolver()
  	  overrides the socket module's versions of getaddrinfo(),
	  getnameinfo(), getfqdn(), gethostbyname(), gethostbyname_ex() and
	  gethostbyaddr() with an implementation which uses a dnspython stub
	  resolver instead of the system's stub resolver.  This can be
	  useful in testing situations where you want to control the
	  resolution behavior of python code without having to change the
	  system's resolver settings (e.g. /etc/resolv.conf).
	  dns.resolver.restore_system_resolver() undoes the change.

	* dns/ipv4.py: dnspython now provides its own, stricter, versions
	  of IPv4 inet_ntoa() and inet_aton() instead of using the OS's
	  versions.

	* dns/ipv6.py: inet_aton() now bounds checks embedded IPv4 addresses
	  more strictly.  Also, now only dns.exception.SyntaxError can be
	  raised on bad input.

	* Old DNSSEC types (KEY, NXT, and SIG) have been removed.

	* Bounds checking of slices in rdata wire processing is now more
	  strict, and bounds errors (e.g. we got less data than was
	  expected) now raise dns.exception.FormError rather than
	  IndexError.

3 files changed, 18 insertions, 24 deletions

diff --git a/net/py-dns/Makefile b/net/py-dns/Makefile
index dbe040714ab..b2c4e62b8a2 100644
--- a/net/py-dns/Makefile
+++ b/net/py-dns/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2012/10/23 17:19:01 asau Exp $
+# $NetBSD: Makefile,v 1.23 2014/01/17 22:48:53 wiz Exp $
 
-DISTNAME=	dnspython-1.9.4
-PKGNAME=	${PYPKGPREFIX}-dns-1.9.4
-PKGREVISION=	1
+DISTNAME=	dnspython-1.11.1
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/python-/-/}
 CATEGORIES=	net python
 MASTER_SITES=	http://www.dnspython.org/kits/${PKGVERSION}/
 
@@ -12,6 +11,7 @@ COMMENT=	Python DNS toolkit
 LICENSE=	modified-bsd
 
 USE_LANGUAGES=	# none
+PYTHON_VERSIONS_INCOMPATIBLE=	33
 
 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/py-dns/PLIST b/net/py-dns/PLIST
index 34b46d152f7..cc1587bbdba 100644
--- a/net/py-dns/PLIST
+++ b/net/py-dns/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2012/04/08 20:21:53 wiz Exp $
+@comment $NetBSD: PLIST,v 1.11 2014/01/17 22:48:53 wiz Exp $
 ${PYSITELIB}/dns/__init__.py
 ${PYSITELIB}/dns/__init__.pyc
 ${PYSITELIB}/dns/__init__.pyo
@@ -20,6 +20,9 @@ ${PYSITELIB}/dns/exception.pyo
 ${PYSITELIB}/dns/flags.py
 ${PYSITELIB}/dns/flags.pyc
 ${PYSITELIB}/dns/flags.pyo
+${PYSITELIB}/dns/grange.py
+${PYSITELIB}/dns/grange.pyc
+${PYSITELIB}/dns/grange.pyo
 ${PYSITELIB}/dns/hash.py
 ${PYSITELIB}/dns/hash.pyc
 ${PYSITELIB}/dns/hash.pyo
@@ -98,9 +101,6 @@ ${PYSITELIB}/dns/rdtypes/ANY/HIP.pyo
 ${PYSITELIB}/dns/rdtypes/ANY/ISDN.py
 ${PYSITELIB}/dns/rdtypes/ANY/ISDN.pyc
 ${PYSITELIB}/dns/rdtypes/ANY/ISDN.pyo
-${PYSITELIB}/dns/rdtypes/ANY/KEY.py
-${PYSITELIB}/dns/rdtypes/ANY/KEY.pyc
-${PYSITELIB}/dns/rdtypes/ANY/KEY.pyo
 ${PYSITELIB}/dns/rdtypes/ANY/LOC.py
 ${PYSITELIB}/dns/rdtypes/ANY/LOC.pyc
 ${PYSITELIB}/dns/rdtypes/ANY/LOC.pyo
@@ -119,9 +119,6 @@ ${PYSITELIB}/dns/rdtypes/ANY/NSEC3.pyo
 ${PYSITELIB}/dns/rdtypes/ANY/NSEC3PARAM.py
 ${PYSITELIB}/dns/rdtypes/ANY/NSEC3PARAM.pyc
 ${PYSITELIB}/dns/rdtypes/ANY/NSEC3PARAM.pyo
-${PYSITELIB}/dns/rdtypes/ANY/NXT.py
-${PYSITELIB}/dns/rdtypes/ANY/NXT.pyc
-${PYSITELIB}/dns/rdtypes/ANY/NXT.pyo
 ${PYSITELIB}/dns/rdtypes/ANY/PTR.py
 ${PYSITELIB}/dns/rdtypes/ANY/PTR.pyc
 ${PYSITELIB}/dns/rdtypes/ANY/PTR.pyo
@@ -134,9 +131,6 @@ ${PYSITELIB}/dns/rdtypes/ANY/RRSIG.pyo
 ${PYSITELIB}/dns/rdtypes/ANY/RT.py
 ${PYSITELIB}/dns/rdtypes/ANY/RT.pyc
 ${PYSITELIB}/dns/rdtypes/ANY/RT.pyo
-${PYSITELIB}/dns/rdtypes/ANY/SIG.py
-${PYSITELIB}/dns/rdtypes/ANY/SIG.pyc
-${PYSITELIB}/dns/rdtypes/ANY/SIG.pyo
 ${PYSITELIB}/dns/rdtypes/ANY/SOA.py
 ${PYSITELIB}/dns/rdtypes/ANY/SOA.pyc
 ${PYSITELIB}/dns/rdtypes/ANY/SOA.pyo
@@ -146,6 +140,9 @@ ${PYSITELIB}/dns/rdtypes/ANY/SPF.pyo
 ${PYSITELIB}/dns/rdtypes/ANY/SSHFP.py
 ${PYSITELIB}/dns/rdtypes/ANY/SSHFP.pyc
 ${PYSITELIB}/dns/rdtypes/ANY/SSHFP.pyo
+${PYSITELIB}/dns/rdtypes/ANY/TLSA.py
+${PYSITELIB}/dns/rdtypes/ANY/TLSA.pyc
+${PYSITELIB}/dns/rdtypes/ANY/TLSA.pyo
 ${PYSITELIB}/dns/rdtypes/ANY/TXT.py
 ${PYSITELIB}/dns/rdtypes/ANY/TXT.pyc
 ${PYSITELIB}/dns/rdtypes/ANY/TXT.pyo
@@ -200,18 +197,12 @@ ${PYSITELIB}/dns/rdtypes/__init__.pyo
 ${PYSITELIB}/dns/rdtypes/dsbase.py
 ${PYSITELIB}/dns/rdtypes/dsbase.pyc
 ${PYSITELIB}/dns/rdtypes/dsbase.pyo
-${PYSITELIB}/dns/rdtypes/keybase.py
-${PYSITELIB}/dns/rdtypes/keybase.pyc
-${PYSITELIB}/dns/rdtypes/keybase.pyo
 ${PYSITELIB}/dns/rdtypes/mxbase.py
 ${PYSITELIB}/dns/rdtypes/mxbase.pyc
 ${PYSITELIB}/dns/rdtypes/mxbase.pyo
 ${PYSITELIB}/dns/rdtypes/nsbase.py
 ${PYSITELIB}/dns/rdtypes/nsbase.pyc
 ${PYSITELIB}/dns/rdtypes/nsbase.pyo
-${PYSITELIB}/dns/rdtypes/sigbase.py
-${PYSITELIB}/dns/rdtypes/sigbase.pyc
-${PYSITELIB}/dns/rdtypes/sigbase.pyo
 ${PYSITELIB}/dns/rdtypes/txtbase.py
 ${PYSITELIB}/dns/rdtypes/txtbase.pyc
 ${PYSITELIB}/dns/rdtypes/txtbase.pyo
@@ -248,6 +239,9 @@ ${PYSITELIB}/dns/update.pyo
 ${PYSITELIB}/dns/version.py
 ${PYSITELIB}/dns/version.pyc
 ${PYSITELIB}/dns/version.pyo
+${PYSITELIB}/dns/wiredata.py
+${PYSITELIB}/dns/wiredata.pyc
+${PYSITELIB}/dns/wiredata.pyo
 ${PYSITELIB}/dns/zone.py
 ${PYSITELIB}/dns/zone.pyc
 ${PYSITELIB}/dns/zone.pyo
diff --git a/net/py-dns/distinfo b/net/py-dns/distinfo
index 9916ecc7ecd..058f6fe270d 100644
--- a/net/py-dns/distinfo
+++ b/net/py-dns/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.11 2011/07/18 16:10:32 gson Exp $
+$NetBSD: distinfo,v 1.12 2014/01/17 22:48:53 wiz Exp $
 
-SHA1 (dnspython-1.9.4.tar.gz) = 41d00d0f81bc9aba02c5c62e1d4a8ee57810410e
-RMD160 (dnspython-1.9.4.tar.gz) = 0ec0bb554208b215e8f70b7ebc41414387d6a178
-Size (dnspython-1.9.4.tar.gz) = 120126 bytes
+SHA1 (dnspython-1.11.1.tar.gz) = d86d1eb6eb28c8ebaea38b4e72e11c800eb04514
+RMD160 (dnspython-1.11.1.tar.gz) = a6369f77c4da591e0e6ede094c3a02e901d52ef9
+Size (dnspython-1.11.1.tar.gz) = 129573 bytes