Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
X-Debbugs-Cc: ca...@deccio.net
Hi,
I'd like to unblock the dnsviz package. The 0.9.3 upstream release
specifically targets the release of bullseye. Per the upstream author
(X-Debbugs-Cc'd):
"FYI, it looks like I'm going to need to push one more fix, as
version 0.9.3. There was some backwards incompatibility introduced
in dnspython 2.0 that I didn't find until after 0.9.2. Since
dnspython 2.0 is what is in bullseye, it will be important to have
that fix."
Further details are available at:
* https://github.com/dnsviz/dnsviz/issues/74
*
https://github.com/dnsviz/dnsviz/commit/37864bba6a90aaa634a9f867c32ed553b2780b9c
The debdiff is attached. It is very similar to the diff between the
upstream tags v0.9.2 and v0.9.3:
* https://github.com/dnsviz/dnsviz/compare/v0.9.2...v0.9.3
The bullseye freeze policy advises that,
"In most cases, it's not appropriate to upload a new upstream
release at this point. New upstream release usually contain
unrelated changes, which might be inappropriate or make review much
more difficult. Uploading a new upstream release is only appropriate
when the resulting debdiff doesn't contain changes that wouldn't be
in the debdiff of a targeted change."
In this case, the entirety of the changes in the new upstream release
contain the targeted fix (other than trivial changes due to the upstream
version number bump).
Thanks.
unblock dnsviz/0.9.3-1
--
Robert Edmonds
edmo...@debian.org
diff -Nru dnsviz-0.9.2/PKG-INFO dnsviz-0.9.3/PKG-INFO
--- dnsviz-0.9.2/PKG-INFO 2021-02-05 23:49:51.000000000 -0500
+++ dnsviz-0.9.3/PKG-INFO 2021-03-11 18:03:26.000000000 -0500
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: dnsviz
-Version: 0.9.2
+Version: 0.9.3
Summary: DNS analysis and visualization tool suite
Home-page: https://github.com/dnsviz/dnsviz/
Author: Casey Deccio
diff -Nru dnsviz-0.9.2/contrib/dnsviz.spec dnsviz-0.9.3/contrib/dnsviz.spec
--- dnsviz-0.9.2/contrib/dnsviz.spec 2021-02-05 23:49:19.000000000 -0500
+++ dnsviz-0.9.3/contrib/dnsviz.spec 2021-03-11 18:03:07.000000000 -0500
@@ -1,5 +1,5 @@
Name: dnsviz
-Version: 0.9.2
+Version: 0.9.3
Release: 1%{?dist}
Summary: Tools for analyzing and visualizing DNS and DNSSEC behavior
@@ -58,6 +58,8 @@
%{_mandir}/man1/%{name}-query.1*
%changelog
+* Thu Mar 11 2021 Casey Deccio
+ 0.9.3 release
* Fri Feb 5 2021 Casey Deccio
0.9.2 release
* Tue Jan 19 2021 Casey Deccio
diff -Nru dnsviz-0.9.2/debian/changelog dnsviz-0.9.3/debian/changelog
--- dnsviz-0.9.2/debian/changelog 2021-02-06 17:55:58.000000000 -0500
+++ dnsviz-0.9.3/debian/changelog 2021-03-16 16:46:46.000000000 -0400
@@ -1,3 +1,10 @@
+dnsviz (0.9.3-1) unstable; urgency=medium
+
+ * New upstream version 0.9.3
+ - Targeted upstream fix for dnspython 2.0.0
+
+ -- Robert Edmonds <edmo...@debian.org> Tue, 16 Mar 2021 16:46:46 -0400
+
dnsviz (0.9.2-1) unstable; urgency=medium
* New upstream version 0.9.2
diff -Nru dnsviz-0.9.2/debian/patches/debian-changes dnsviz-0.9.3/debian/patches/debian-changes
--- dnsviz-0.9.2/debian/patches/debian-changes 2021-02-06 17:55:58.000000000 -0500
+++ dnsviz-0.9.3/debian/patches/debian-changes 2021-03-16 16:46:46.000000000 -0400
@@ -8,72 +8,72 @@
For full commit history and separated commits, see the packaging Git
repository.
---- dnsviz-0.9.2.orig/bin/dnsviz
-+++ dnsviz-0.9.2/bin/dnsviz
+--- dnsviz-0.9.3.orig/bin/dnsviz
++++ dnsviz-0.9.3/bin/dnsviz
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# This file is a part of DNSViz, a tool suite for DNS/DNSSEC monitoring,
# analysis, and visualization.
---- dnsviz-0.9.2.orig/contrib/digviz
-+++ dnsviz-0.9.2/contrib/digviz
+--- dnsviz-0.9.3.orig/contrib/digviz
++++ dnsviz-0.9.3/contrib/digviz
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# This file is a part of DNSViz, a tool suite for DNS/DNSSEC monitoring,
# analysis, and visualization.
---- dnsviz-0.9.2.orig/contrib/dnsviz-lg.cgi
-+++ dnsviz-0.9.2/contrib/dnsviz-lg.cgi
+--- dnsviz-0.9.3.orig/contrib/dnsviz-lg.cgi
++++ dnsviz-0.9.3/contrib/dnsviz-lg.cgi
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# This file is a part of DNSViz, a tool suite for DNS/DNSSEC monitoring,
# analysis, and visualization.
---- dnsviz-0.9.2.orig/dnsviz/commands/graph.py
-+++ dnsviz-0.9.2/dnsviz/commands/graph.py
+--- dnsviz-0.9.3.orig/dnsviz/commands/graph.py
++++ dnsviz-0.9.3/dnsviz/commands/graph.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# This file is a part of DNSViz, a tool suite for DNS/DNSSEC monitoring,
# analysis, and visualization.
---- dnsviz-0.9.2.orig/dnsviz/commands/grok.py
-+++ dnsviz-0.9.2/dnsviz/commands/grok.py
+--- dnsviz-0.9.3.orig/dnsviz/commands/grok.py
++++ dnsviz-0.9.3/dnsviz/commands/grok.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# This file is a part of DNSViz, a tool suite for DNS/DNSSEC monitoring,
# analysis, and visualization.
---- dnsviz-0.9.2.orig/dnsviz/commands/lookingglass.py
-+++ dnsviz-0.9.2/dnsviz/commands/lookingglass.py
+--- dnsviz-0.9.3.orig/dnsviz/commands/lookingglass.py
++++ dnsviz-0.9.3/dnsviz/commands/lookingglass.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# This file is a part of DNSViz, a tool suite for DNS/DNSSEC monitoring,
# analysis, and visualization.
---- dnsviz-0.9.2.orig/dnsviz/commands/print.py
-+++ dnsviz-0.9.2/dnsviz/commands/print.py
+--- dnsviz-0.9.3.orig/dnsviz/commands/print.py
++++ dnsviz-0.9.3/dnsviz/commands/print.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# This file is a part of DNSViz, a tool suite for DNS/DNSSEC monitoring,
# analysis, and visualization.
---- dnsviz-0.9.2.orig/dnsviz/commands/probe.py
-+++ dnsviz-0.9.2/dnsviz/commands/probe.py
+--- dnsviz-0.9.3.orig/dnsviz/commands/probe.py
++++ dnsviz-0.9.3/dnsviz/commands/probe.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# This file is a part of DNSViz, a tool suite for DNS/DNSSEC monitoring,
# analysis, and visualization.
---- dnsviz-0.9.2.orig/dnsviz/commands/query.py
-+++ dnsviz-0.9.2/dnsviz/commands/query.py
+--- dnsviz-0.9.3.orig/dnsviz/commands/query.py
++++ dnsviz-0.9.3/dnsviz/commands/query.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
@@ -81,7 +81,7 @@
# This file is a part of DNSViz, a tool suite for DNS/DNSSEC monitoring,
# analysis, and visualization.
--- /dev/null
-+++ dnsviz-0.9.2/dnsviz/config.py
++++ dnsviz-0.9.3/dnsviz/config.py
@@ -0,0 +1,40 @@
+#
+# This file is a part of DNSViz, a tool suite for DNS/DNSSEC monitoring,
@@ -123,8 +123,8 @@
+JQUERY_UI_CSS_PATH = 'file:///usr/share/javascript/jquery-ui-themes/redmond/jquery-ui.css'
+RAPHAEL_PATH = 'file:///usr/share/javascript/raphael/raphael.min.js'
+RESOLV_CONF = '/etc/resolv.conf'
---- dnsviz-0.9.2.orig/doc/Makefile
-+++ dnsviz-0.9.2/doc/Makefile
+--- dnsviz-0.9.3.orig/doc/Makefile
++++ dnsviz-0.9.3/doc/Makefile
@@ -20,7 +20,7 @@ ICONWIDTH = 25
icons: $(ICONPNGFILES)
@@ -151,8 +151,8 @@
.PHONY: clean
---- dnsviz-0.9.2.orig/setup.py
-+++ dnsviz-0.9.2/setup.py
+--- dnsviz-0.9.3.orig/setup.py
++++ dnsviz-0.9.3/setup.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
diff -Nru dnsviz-0.9.2/dnsviz/query.py dnsviz-0.9.3/dnsviz/query.py
--- dnsviz-0.9.2/dnsviz/query.py 2021-02-05 23:49:19.000000000 -0500
+++ dnsviz-0.9.3/dnsviz/query.py 2021-03-11 18:03:07.000000000 -0500
@@ -375,7 +375,8 @@
def handle(self, response_wire, response, response_time):
timeouts = self._get_num_timeouts(response)
if not self._params['tcp'] and timeouts >= self._timeouts and self._request.payload > self._reduced_payload:
- self._request.payload = self._reduced_payload
+ self._request.use_edns(self._request.edns, self._request.ednsflags,
+ self._reduced_payload, options=self._request.options)
return DNSQueryRetryAttempt(response_time, RETRY_CAUSE_TIMEOUT, None, RETRY_ACTION_CHANGE_UDP_MAX_PAYLOAD, self._reduced_payload)
class ClearEDNSFlagOnTimeoutHandler(DNSResponseHandler):
@@ -412,12 +413,10 @@
def handle(self, response_wire, response, response_time):
timeouts = self._get_num_timeouts(response)
- try:
+ if not self._params['tcp'] and timeouts >= self._timeouts and self._request.options:
opt = self._request.options[0]
- except IndexError:
- opt = None
- if not self._params['tcp'] and timeouts >= self._timeouts and opt is not None:
- self._request.options.remove(opt)
+ self._request.use_edns(self._request.edns, self._request.ednsflags,
+ self._request.payload, options=self._request.options[1:])
return DNSQueryRetryAttempt(response_time, RETRY_CAUSE_TIMEOUT, None, RETRY_ACTION_REMOVE_EDNS_OPTION, opt.otype)
class DisableEDNSOnTimeoutHandler(DNSResponseHandler):
@@ -464,12 +463,10 @@
self._rcode = rcode
def handle(self, response_wire, response, response_time):
- try:
+ if isinstance(response, dns.message.Message) and response.rcode() == self._rcode and self._request.options:
opt = self._request.options[0]
- except IndexError:
- opt = None
- if isinstance(response, dns.message.Message) and response.rcode() == self._rcode and opt is not None:
- self._request.options.remove(opt)
+ self._request.use_edns(self._request.edns, self._request.ednsflags,
+ self._request.payload, options=self._request.options[1:])
return DNSQueryRetryAttempt(response_time, RETRY_CAUSE_RCODE, response.rcode(), RETRY_ACTION_REMOVE_EDNS_OPTION, opt.otype)
class AddServerCookieOnBADCOOKIE(DNSResponseHandler):
@@ -608,7 +605,8 @@
if timeouts >= self._initial_timeouts:
self._lower_bound = self._reduced_payload
self._upper_bound = self._request.payload - 1
- self._request.payload = self._reduced_payload
+ self._request.use_edns(self._request.edns, self._request.ednsflags,
+ self._reduced_payload, options=self._request.options)
self._state = self.REDUCED_PAYLOAD
return DNSQueryRetryAttempt(response_time, RETRY_CAUSE_TIMEOUT, None, RETRY_ACTION_CHANGE_UDP_MAX_PAYLOAD, self._reduced_payload)
@@ -633,7 +631,8 @@
#XXX this is cheating because we're not reporting the change to UDP
self._params['tcp'] = False
payload = response_len - 1
- self._request.payload = payload
+ self._request.use_edns(self._request.edns, self._request.ednsflags,
+ payload, options=self._request.options)
self._state = self.TCP_MINUS_ONE
return DNSQueryRetryAttempt(response_time, RETRY_CAUSE_DIAGNOSTIC, response_len, RETRY_ACTION_CHANGE_UDP_MAX_PAYLOAD, payload)
@@ -641,7 +640,8 @@
if is_timeout:
self._upper_bound = self._request.payload - 1
payload = self._lower_bound + (self._upper_bound + 1 - self._lower_bound)//2
- self._request.payload = payload
+ self._request.use_edns(self._request.edns, self._request.ednsflags,
+ payload, options=self._request.options)
self._state = self.PICKLE
return DNSQueryRetryAttempt(response_time, RETRY_CAUSE_TIMEOUT, None, RETRY_ACTION_CHANGE_UDP_MAX_PAYLOAD, payload)
# if the size of the message is less than the watermark, then perhaps we were rate limited
@@ -675,7 +675,8 @@
elif is_timeout:
self._upper_bound = self._request.payload - 1
payload = self._lower_bound + (self._upper_bound + 1 - self._lower_bound)//2
- self._request.payload = payload
+ self._request.use_edns(self._request.edns, self._request.ednsflags,
+ payload, options=self._request.options)
return DNSQueryRetryAttempt(response_time, RETRY_CAUSE_TIMEOUT, None, RETRY_ACTION_CHANGE_UDP_MAX_PAYLOAD, payload)
# if the size of the message is less than the watermark, then perhaps we were rate limited
elif response_len < self._water_mark:
@@ -691,7 +692,8 @@
elif is_valid:
self._lower_bound = self._request.payload
payload = self._lower_bound + (self._upper_bound + 1 - self._lower_bound)//2
- self._request.payload = payload
+ self._request.use_edns(self._request.edns, self._request.ednsflags,
+ payload, options=self._request.options)
return DNSQueryRetryAttempt(response_time, RETRY_CAUSE_DIAGNOSTIC, response_len, RETRY_ACTION_CHANGE_UDP_MAX_PAYLOAD, payload)
elif self._state == self.TCP_FINAL:
diff -Nru dnsviz-0.9.2/dnsviz/transport.py dnsviz-0.9.3/dnsviz/transport.py
--- dnsviz-0.9.2/dnsviz/transport.py 2021-02-05 23:49:19.000000000 -0500
+++ dnsviz-0.9.3/dnsviz/transport.py 2021-03-11 18:03:07.000000000 -0500
@@ -812,7 +812,7 @@
def init_req(self):
data = self._post_data()
- self.msg_send = codecs.encode('POST %s HTTP/1.1\r\nHost: %s\r\nUser-Agent: DNSViz/0.9.2\r\nAccept: application/json\r\n%sContent-Length: %d\r\nContent-Type: application/x-www-form-urlencoded\r\n\r\n%s' % (self.path, self.host, self._authentication_header(), len(data), data), 'latin1')
+ self.msg_send = codecs.encode('POST %s HTTP/1.1\r\nHost: %s\r\nUser-Agent: DNSViz/0.9.3\r\nAccept: application/json\r\n%sContent-Length: %d\r\nContent-Type: application/x-www-form-urlencoded\r\n\r\n%s' % (self.path, self.host, self._authentication_header(), len(data), data), 'latin1')
self.msg_send_len = len(self.msg_send)
self.msg_send_index = 0
diff -Nru dnsviz-0.9.2/dnsviz.egg-info/PKG-INFO dnsviz-0.9.3/dnsviz.egg-info/PKG-INFO
--- dnsviz-0.9.2/dnsviz.egg-info/PKG-INFO 2021-02-05 23:49:50.000000000 -0500
+++ dnsviz-0.9.3/dnsviz.egg-info/PKG-INFO 2021-03-11 18:03:26.000000000 -0500
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: dnsviz
-Version: 0.9.2
+Version: 0.9.3
Summary: DNS analysis and visualization tool suite
Home-page: https://github.com/dnsviz/dnsviz/
Author: Casey Deccio
diff -Nru dnsviz-0.9.2/doc/man/dnsviz-graph.1 dnsviz-0.9.3/doc/man/dnsviz-graph.1
--- dnsviz-0.9.2/doc/man/dnsviz-graph.1 2021-02-05 23:49:19.000000000 -0500
+++ dnsviz-0.9.3/doc/man/dnsviz-graph.1 2021-03-11 18:03:07.000000000 -0500
@@ -20,7 +20,7 @@
.\" You should have received a copy of the GNU General Public License along
.\" with DNSViz. If not, see <http://www.gnu.org/licenses/>.
.\"
-.TH dnsviz-probe 1 "5 Feb 2021" "0.9.2"
+.TH dnsviz-probe 1 "11 Mar 2021" "0.9.3"
.SH NAME
dnsviz-graph \- graph the assessment of diagnostic DNS queries
.SH SYNOPSIS
diff -Nru dnsviz-0.9.2/doc/man/dnsviz-grok.1 dnsviz-0.9.3/doc/man/dnsviz-grok.1
--- dnsviz-0.9.2/doc/man/dnsviz-grok.1 2021-02-05 23:49:19.000000000 -0500
+++ dnsviz-0.9.3/doc/man/dnsviz-grok.1 2021-03-11 18:03:07.000000000 -0500
@@ -20,7 +20,7 @@
.\" You should have received a copy of the GNU General Public License along
.\" with DNSViz. If not, see <http://www.gnu.org/licenses/>.
.\"
-.TH dnsviz-grok 1 "5 Feb 2021" "0.9.2"
+.TH dnsviz-grok 1 "11 Mar 2021" "0.9.3"
.SH NAME
dnsviz-grok \- assess diagnostic DNS queries
.SH SYNOPSIS
diff -Nru dnsviz-0.9.2/doc/man/dnsviz-print.1 dnsviz-0.9.3/doc/man/dnsviz-print.1
--- dnsviz-0.9.2/doc/man/dnsviz-print.1 2021-02-05 23:49:19.000000000 -0500
+++ dnsviz-0.9.3/doc/man/dnsviz-print.1 2021-03-11 18:03:07.000000000 -0500
@@ -20,7 +20,7 @@
.\" You should have received a copy of the GNU General Public License along
.\" with DNSViz. If not, see <http://www.gnu.org/licenses/>.
.\"
-.TH dnsviz-print 1 "5 Feb 2021" "0.9.2"
+.TH dnsviz-print 1 "11 Mar 2021" "0.9.3"
.SH NAME
dnsviz-print \- print the assessment of diagnostic DNS queries
.SH SYNOPSIS
diff -Nru dnsviz-0.9.2/doc/man/dnsviz-probe.1 dnsviz-0.9.3/doc/man/dnsviz-probe.1
--- dnsviz-0.9.2/doc/man/dnsviz-probe.1 2021-02-05 23:49:19.000000000 -0500
+++ dnsviz-0.9.3/doc/man/dnsviz-probe.1 2021-03-11 18:03:07.000000000 -0500
@@ -20,7 +20,7 @@
.\" You should have received a copy of the GNU General Public License along
.\" with DNSViz. If not, see <http://www.gnu.org/licenses/>.
.\"
-.TH dnsviz-probe 1 "5 Feb 2021" "0.9.2"
+.TH dnsviz-probe 1 "11 Mar 2021" "0.9.3"
.SH NAME
dnsviz-probe \- issue diagnostic DNS queries
.SH SYNOPSIS
diff -Nru dnsviz-0.9.2/doc/man/dnsviz-query.1 dnsviz-0.9.3/doc/man/dnsviz-query.1
--- dnsviz-0.9.2/doc/man/dnsviz-query.1 2021-02-05 23:49:19.000000000 -0500
+++ dnsviz-0.9.3/doc/man/dnsviz-query.1 2021-03-11 18:03:07.000000000 -0500
@@ -20,7 +20,7 @@
.\" You should have received a copy of the GNU General Public License along
.\" with DNSViz. If not, see <http://www.gnu.org/licenses/>.
.\"
-.TH dnsviz-query 1 "5 Feb 2021" "0.9.2"
+.TH dnsviz-query 1 "11 Mar 2021" "0.9.3"
.SH NAME
dnsviz-query \- assess a DNS query
.SH SYNOPSIS
diff -Nru dnsviz-0.9.2/doc/man/dnsviz.1 dnsviz-0.9.3/doc/man/dnsviz.1
--- dnsviz-0.9.2/doc/man/dnsviz.1 2021-02-05 23:49:19.000000000 -0500
+++ dnsviz-0.9.3/doc/man/dnsviz.1 2021-03-11 18:03:07.000000000 -0500
@@ -20,7 +20,7 @@
.\" You should have received a copy of the GNU General Public License along
.\" with DNSViz. If not, see <http://www.gnu.org/licenses/>.
.\"
-.TH dnsviz 1 "5 Feb 2021" "0.9.2"
+.TH dnsviz 1 "11 Mar 2021" "0.9.3"
.SH NAME
dnsviz \- issue and assess diagnostic DNS queries
.SH SYNOPSIS
diff -Nru dnsviz-0.9.2/setup.py dnsviz-0.9.3/setup.py
--- dnsviz-0.9.2/setup.py 2021-02-05 23:49:19.000000000 -0500
+++ dnsviz-0.9.3/setup.py 2021-03-11 18:03:07.000000000 -0500
@@ -120,7 +120,7 @@
create_config('')
setup(name='dnsviz',
- version='0.9.2',
+ version='0.9.3',
author='Casey Deccio',
author_email='ca...@deccio.net',
url='https://github.com/dnsviz/dnsviz/',
