diff -Nru dnspython-1.16.0/debian/changelog dnspython-1.16.0/debian/changelog
--- dnspython-1.16.0/debian/changelog	2019-12-17 12:32:31.000000000 +0000
+++ dnspython-1.16.0/debian/changelog	2022-06-30 08:40:05.000000000 +0000
@@ -1,3 +1,10 @@
+dnspython (1.16.0-1ubuntu1) focal; urgency=medium
+
+  * Fix dns.query.xfr(lifetime=None, timeout=not None) (LP: #1941988)
+    - d/p/lp1941988-When-doing-xfr-do-not-compare-with-expiration.patch
+
+ -- Brett Milford <brett.milford@canonical.com>  Thu, 30 Jun 2022 08:40:05 +0000
+
 dnspython (1.16.0-1build1) focal; urgency=medium
 
   * No-change rebuild to generate dependencies on python2.
diff -Nru dnspython-1.16.0/debian/control dnspython-1.16.0/debian/control
--- dnspython-1.16.0/debian/control	2018-12-23 01:12:46.000000000 +0000
+++ dnspython-1.16.0/debian/control	2022-06-30 08:40:05.000000000 +0000
@@ -1,7 +1,8 @@
 Source: dnspython
 Section: python
 Priority: optional
-Maintainer: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
 Uploaders: Robert S. Edmonds <edmonds@debian.org>, Scott Kitterman <scott@kitterman.com>, Matthew Grant <matthewgrant5@gmail.com>
 Build-Depends: debhelper (>= 9~), python-all (>= 2.6.6-3~), python-setuptools, python3-all (>= 3.3), python3-setuptools, dh-python, netbase
 Homepage: http://www.dnspython.org
diff -Nru dnspython-1.16.0/debian/patches/lp1941988-When-doing-xfr-do-not-compare-with-expiration.patch dnspython-1.16.0/debian/patches/lp1941988-When-doing-xfr-do-not-compare-with-expiration.patch
--- dnspython-1.16.0/debian/patches/lp1941988-When-doing-xfr-do-not-compare-with-expiration.patch	1970-01-01 00:00:00.000000000 +0000
+++ dnspython-1.16.0/debian/patches/lp1941988-When-doing-xfr-do-not-compare-with-expiration.patch	2022-06-30 08:40:05.000000000 +0000
@@ -0,0 +1,26 @@
+Origin: upstream, https://github.com/rthalley/dnspython/commit/9fbf9b223dc26262b1cf23f623f89283ee9c8375
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1941988
+From 9fbf9b223dc26262b1cf23f623f89283ee9c8375 Mon Sep 17 00:00:00 2001
+From: Bob Halley <halley@dnspython.org>
+Date: Sun, 29 Sep 2019 13:39:41 -0700
+Subject: [PATCH] When doing xfr, do not compare with expiration if it is None.
+ [Issue #390]
+
+---
+ dns/query.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+Index: dnspython-1.16.0/dns/query.py
+===================================================================
+--- dnspython-1.16.0.orig/dns/query.py
++++ dnspython-1.16.0/dns/query.py
+@@ -608,7 +608,8 @@ def xfr(where, zone, rdtype=dns.rdatatyp
+     first = True
+     while not done:
+         mexpiration = _compute_expiration(timeout)
+-        if mexpiration is None or mexpiration > expiration:
++        if mexpiration is None or \
++           (expiration is not None and mexpiration > expiration):
+             mexpiration = expiration
+         if use_udp:
+             _wait_for_readable(s, expiration)
diff -Nru dnspython-1.16.0/debian/patches/series dnspython-1.16.0/debian/patches/series
--- dnspython-1.16.0/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ dnspython-1.16.0/debian/patches/series	2022-06-30 08:40:05.000000000 +0000
@@ -0,0 +1 @@
+lp1941988-When-doing-xfr-do-not-compare-with-expiration.patch