From 50158aef45f25f9eb7c8897a7f3f08ad1a54ccff Mon Sep 17 00:00:00 2001 From: rexxnor Date: Mon, 10 Jun 2019 00:55:11 +0200 Subject: fixed small GNS2DNS bug --- ascension-0.11.5.tar.gz | Bin 11025 -> 11038 bytes ascension/ascension.py | 7 +++-- deb_dist/ascension-0.11.5/ascension/ascension.py | 7 +++-- deb_dist/ascension-0.11.5/debian/changelog | 2 +- .../debian/python3-ascension/DEBIAN/md5sums | 4 +-- .../doc/python3-ascension/changelog.Debian.gz | Bin 163 -> 162 bytes deb_dist/ascension-0.11.5/debian/rules | 2 +- deb_dist/ascension_0.11.5-1.debian.tar.xz | Bin 1672 -> 1668 bytes deb_dist/ascension_0.11.5-1.dsc | 12 ++++---- deb_dist/ascension_0.11.5-1_amd64.buildinfo | 16 +++++------ deb_dist/ascension_0.11.5-1_amd64.changes | 32 ++++++++++----------- deb_dist/ascension_0.11.5-1_source.buildinfo | 10 +++---- deb_dist/ascension_0.11.5-1_source.changes | 26 ++++++++--------- deb_dist/ascension_0.11.5.orig.tar.gz | Bin 11025 -> 11038 bytes deb_dist/python3-ascension_0.11.5-1_all.deb | Bin 11790 -> 11796 bytes 15 files changed, 62 insertions(+), 56 deletions(-) diff --git a/ascension-0.11.5.tar.gz b/ascension-0.11.5.tar.gz index dfdfda6..6a05fc5 100644 Binary files a/ascension-0.11.5.tar.gz and b/ascension-0.11.5.tar.gz differ diff --git a/ascension/ascension.py b/ascension/ascension.py index 9e59a93..5f3b4cb 100644 --- a/ascension/ascension.py +++ b/ascension/ascension.py @@ -399,19 +399,21 @@ class Ascender(): if nameserver[-1] == ".": nameserver = nameserver[:-1] if str(value)[-1] == ".": + if label == "@": + return (None, None, None) # FQDN provided if value.endswith(".%s." % zonename): # in bailiwick value = self.resolve_glue(record.target) else: - # out of bailiwick + # out of bailiwick value = '%s.%s@%s' % (str(label), zonename, nameserver) else: # Name is relative to zone, must be in bailiwick value = self.resolve_glue(record.target) if not value: if label.startswith("@"): - value = '%s@%s.%s' % (self.domain, + value = '%s@%s.%s' % (zonename, record.target, self.domain) else: @@ -634,6 +636,7 @@ class Ascender(): pkey = self.create_zone_and_get_pkey(zonename) self.subzonedict[zonename] = (pkey, ttl) + # Check if a delegated zone is available in GNS as per NS record # Adds NS records that contain "gns--pkey--" to dictionary nsrecords = self.zone.iterate_rdatasets(dns.rdatatype.NS) diff --git a/deb_dist/ascension-0.11.5/ascension/ascension.py b/deb_dist/ascension-0.11.5/ascension/ascension.py index 9e59a93..5f3b4cb 100644 --- a/deb_dist/ascension-0.11.5/ascension/ascension.py +++ b/deb_dist/ascension-0.11.5/ascension/ascension.py @@ -399,19 +399,21 @@ class Ascender(): if nameserver[-1] == ".": nameserver = nameserver[:-1] if str(value)[-1] == ".": + if label == "@": + return (None, None, None) # FQDN provided if value.endswith(".%s." % zonename): # in bailiwick value = self.resolve_glue(record.target) else: - # out of bailiwick + # out of bailiwick value = '%s.%s@%s' % (str(label), zonename, nameserver) else: # Name is relative to zone, must be in bailiwick value = self.resolve_glue(record.target) if not value: if label.startswith("@"): - value = '%s@%s.%s' % (self.domain, + value = '%s@%s.%s' % (zonename, record.target, self.domain) else: @@ -634,6 +636,7 @@ class Ascender(): pkey = self.create_zone_and_get_pkey(zonename) self.subzonedict[zonename] = (pkey, ttl) + # Check if a delegated zone is available in GNS as per NS record # Adds NS records that contain "gns--pkey--" to dictionary nsrecords = self.zone.iterate_rdatasets(dns.rdatatype.NS) diff --git a/deb_dist/ascension-0.11.5/debian/changelog b/deb_dist/ascension-0.11.5/debian/changelog index a331b3a..c77a6e7 100644 --- a/deb_dist/ascension-0.11.5/debian/changelog +++ b/deb_dist/ascension-0.11.5/debian/changelog @@ -2,4 +2,4 @@ ascension (0.11.5-1) unstable; urgency=low * source package automatically created by stdeb 0.8.5 - -- rexxnor Thu, 06 Jun 2019 19:42:28 +0000 + -- rexxnor Sun, 09 Jun 2019 22:53:18 +0000 diff --git a/deb_dist/ascension-0.11.5/debian/python3-ascension/DEBIAN/md5sums b/deb_dist/ascension-0.11.5/debian/python3-ascension/DEBIAN/md5sums index cdbb584..41e56cd 100644 --- a/deb_dist/ascension-0.11.5/debian/python3-ascension/DEBIAN/md5sums +++ b/deb_dist/ascension-0.11.5/debian/python3-ascension/DEBIAN/md5sums @@ -5,6 +5,6 @@ b9326cd655bd4569eaeb5f029ae298d4 usr/lib/python3/dist-packages/ascension-0.11.5 d41d8cd98f00b204e9800998ecf8427e usr/lib/python3/dist-packages/ascension-0.11.5.egg-info/requires.txt e616e4373e7b199db038fd8e938a3188 usr/lib/python3/dist-packages/ascension-0.11.5.egg-info/top_level.txt d41d8cd98f00b204e9800998ecf8427e usr/lib/python3/dist-packages/ascension/__init__.py -010101d302b9bf9ead10e3abcd3da06d usr/lib/python3/dist-packages/ascension/ascension.py +aaf97781698b77744d5e82c2f56d3990 usr/lib/python3/dist-packages/ascension/ascension.py de060b4ca299c6460ff508aed915526b usr/man/man1/ascension.1 -ffdaa2aece10c03d37f918814006f3e8 usr/share/doc/python3-ascension/changelog.Debian.gz +679130fdb23533e4a6a77f7fcdbbfe13 usr/share/doc/python3-ascension/changelog.Debian.gz diff --git a/deb_dist/ascension-0.11.5/debian/python3-ascension/usr/share/doc/python3-ascension/changelog.Debian.gz b/deb_dist/ascension-0.11.5/debian/python3-ascension/usr/share/doc/python3-ascension/changelog.Debian.gz index 9bc3c6a..55c00b8 100644 Binary files a/deb_dist/ascension-0.11.5/debian/python3-ascension/usr/share/doc/python3-ascension/changelog.Debian.gz and b/deb_dist/ascension-0.11.5/debian/python3-ascension/usr/share/doc/python3-ascension/changelog.Debian.gz differ diff --git a/deb_dist/ascension-0.11.5/debian/rules b/deb_dist/ascension-0.11.5/debian/rules index d461281..0c8110b 100755 --- a/deb_dist/ascension-0.11.5/debian/rules +++ b/deb_dist/ascension-0.11.5/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f # This file was automatically generated by stdeb 0.8.5 at -# Thu, 06 Jun 2019 19:42:28 +0000 +# Sun, 09 Jun 2019 22:53:18 +0000 %: dh $@ --with python3 --buildsystem=python_distutils diff --git a/deb_dist/ascension_0.11.5-1.debian.tar.xz b/deb_dist/ascension_0.11.5-1.debian.tar.xz index d2fdf66..2819b66 100644 Binary files a/deb_dist/ascension_0.11.5-1.debian.tar.xz and b/deb_dist/ascension_0.11.5-1.debian.tar.xz differ diff --git a/deb_dist/ascension_0.11.5-1.dsc b/deb_dist/ascension_0.11.5-1.dsc index e6c96f3..27a8946 100644 --- a/deb_dist/ascension_0.11.5-1.dsc +++ b/deb_dist/ascension_0.11.5-1.dsc @@ -9,11 +9,11 @@ Build-Depends: python3-setuptools, python3-all, debhelper (>= 7.4.3) Package-List: python3-ascension deb python optional arch=all Checksums-Sha1: - cc6f1d1a8212d096f3a67ead352ab289331ce1f2 11025 ascension_0.11.5.orig.tar.gz - 2909f640b7ea374fe3c3fb2c4a0221ea85380b5f 1672 ascension_0.11.5-1.debian.tar.xz + 82c1e17024c599387c7238a9c05f01cce17c769b 11038 ascension_0.11.5.orig.tar.gz + accb16a27a389cb1aadc343b0ba865c01e9a2c98 1668 ascension_0.11.5-1.debian.tar.xz Checksums-Sha256: - bdd8f289e9955dc9d06ca9a8e8c6ef3611ab5ddbc9896e7313074c83ff985c34 11025 ascension_0.11.5.orig.tar.gz - 300552254bdcd426d9d5dc04f7d14a67b42391838bb65c571ae3a33eb8db498e 1672 ascension_0.11.5-1.debian.tar.xz + f21f936c303cd0403260b3621000a94ade839300e4cf22dd4e7644f4f3479e62 11038 ascension_0.11.5.orig.tar.gz + ccb9f05c100f6ea65318dfad963c9bfa085378e03833102703a51651b2c11697 1668 ascension_0.11.5-1.debian.tar.xz Files: - 3e3ff56b2cf59aeaca139740e84337fc 11025 ascension_0.11.5.orig.tar.gz - 757f7fefe6063aa5507851a972835ff2 1672 ascension_0.11.5-1.debian.tar.xz + 0f665ff382859108057a37aa2f9bd5cf 11038 ascension_0.11.5.orig.tar.gz + d11120597a3487082590bfe282e06966 1668 ascension_0.11.5-1.debian.tar.xz diff --git a/deb_dist/ascension_0.11.5-1_amd64.buildinfo b/deb_dist/ascension_0.11.5-1_amd64.buildinfo index a4f7290..c2eca68 100644 --- a/deb_dist/ascension_0.11.5-1_amd64.buildinfo +++ b/deb_dist/ascension_0.11.5-1_amd64.buildinfo @@ -4,17 +4,17 @@ Binary: python3-ascension Architecture: all source Version: 0.11.5-1 Checksums-Md5: - 645068ca353c4dc9b6514a0c89ff1078 846 ascension_0.11.5-1.dsc - 52a78ed44b5a5a8d61daf8370f9ec1ca 11790 python3-ascension_0.11.5-1_all.deb + d006836b17cfe5fa8b9eb1212ae12001 846 ascension_0.11.5-1.dsc + 453ed4a0f9fddea44d0e8518ff0bc579 11796 python3-ascension_0.11.5-1_all.deb Checksums-Sha1: - 923003ff06f549137d075cdab4a508374ba86022 846 ascension_0.11.5-1.dsc - d5fac57f142088b493ce61f95f06a6095c7c6bad 11790 python3-ascension_0.11.5-1_all.deb + b61931de054e056f1a8a8793f38853d81119f578 846 ascension_0.11.5-1.dsc + 5d458bc9ebebb5f0f2de605a050cdbfa91219717 11796 python3-ascension_0.11.5-1_all.deb Checksums-Sha256: - dd6c5f22d60b88d26acce9abebd89857e40e4ec107fc1bd145aae9d4299afaa5 846 ascension_0.11.5-1.dsc - 7b02a0cc79d70cb79781aa464631a92b2cd0f4a297b31cfa9da435105814b07f 11790 python3-ascension_0.11.5-1_all.deb + 88687d2a5dd9e76c7982426d2fa3b5082e83136d420c5f874f55c16a29cb0e6b 846 ascension_0.11.5-1.dsc + 9a5c716e947deef8d4cacabbebc6f37ced323a7649aafd8b640692bf341373d7 11796 python3-ascension_0.11.5-1_all.deb Build-Origin: Debian Build-Architecture: amd64 -Build-Date: Thu, 06 Jun 2019 19:43:00 +0000 +Build-Date: Sun, 09 Jun 2019 22:54:29 +0000 Installed-Build-Depends: autoconf (= 2.69-10), automake (= 1:1.15-6), @@ -177,4 +177,4 @@ Installed-Build-Depends: zlib1g (= 1:1.2.8.dfsg-5) Environment: DEB_BUILD_OPTIONS="parallel=2" - SOURCE_DATE_EPOCH="1559850148" + SOURCE_DATE_EPOCH="1560120798" diff --git a/deb_dist/ascension_0.11.5-1_amd64.changes b/deb_dist/ascension_0.11.5-1_amd64.changes index 29e6b0e..7217aba 100644 --- a/deb_dist/ascension_0.11.5-1_amd64.changes +++ b/deb_dist/ascension_0.11.5-1_amd64.changes @@ -1,5 +1,5 @@ Format: 1.8 -Date: Thu, 06 Jun 2019 19:42:28 +0000 +Date: Sun, 09 Jun 2019 22:53:18 +0000 Source: ascension Binary: python3-ascension Architecture: source all @@ -15,20 +15,20 @@ Changes: . * source package automatically created by stdeb 0.8.5 Checksums-Sha1: - 923003ff06f549137d075cdab4a508374ba86022 846 ascension_0.11.5-1.dsc - cc6f1d1a8212d096f3a67ead352ab289331ce1f2 11025 ascension_0.11.5.orig.tar.gz - 2909f640b7ea374fe3c3fb2c4a0221ea85380b5f 1672 ascension_0.11.5-1.debian.tar.xz - 250ddf8ab458927744c259af8902e5a37b1aa468 5432 ascension_0.11.5-1_amd64.buildinfo - d5fac57f142088b493ce61f95f06a6095c7c6bad 11790 python3-ascension_0.11.5-1_all.deb + b61931de054e056f1a8a8793f38853d81119f578 846 ascension_0.11.5-1.dsc + 82c1e17024c599387c7238a9c05f01cce17c769b 11038 ascension_0.11.5.orig.tar.gz + accb16a27a389cb1aadc343b0ba865c01e9a2c98 1668 ascension_0.11.5-1.debian.tar.xz + 690df4dc084260e575be267e893889f8e8944070 5432 ascension_0.11.5-1_amd64.buildinfo + 5d458bc9ebebb5f0f2de605a050cdbfa91219717 11796 python3-ascension_0.11.5-1_all.deb Checksums-Sha256: - dd6c5f22d60b88d26acce9abebd89857e40e4ec107fc1bd145aae9d4299afaa5 846 ascension_0.11.5-1.dsc - bdd8f289e9955dc9d06ca9a8e8c6ef3611ab5ddbc9896e7313074c83ff985c34 11025 ascension_0.11.5.orig.tar.gz - 300552254bdcd426d9d5dc04f7d14a67b42391838bb65c571ae3a33eb8db498e 1672 ascension_0.11.5-1.debian.tar.xz - 4ff913c00e2b003dd9dd3376f477262331f02802c52a95928e14d55fc2163751 5432 ascension_0.11.5-1_amd64.buildinfo - 7b02a0cc79d70cb79781aa464631a92b2cd0f4a297b31cfa9da435105814b07f 11790 python3-ascension_0.11.5-1_all.deb + 88687d2a5dd9e76c7982426d2fa3b5082e83136d420c5f874f55c16a29cb0e6b 846 ascension_0.11.5-1.dsc + f21f936c303cd0403260b3621000a94ade839300e4cf22dd4e7644f4f3479e62 11038 ascension_0.11.5.orig.tar.gz + ccb9f05c100f6ea65318dfad963c9bfa085378e03833102703a51651b2c11697 1668 ascension_0.11.5-1.debian.tar.xz + 671fdcc7ea8bce0497dad584888b7826001f66c78138be3f18c4f557e86f07a1 5432 ascension_0.11.5-1_amd64.buildinfo + 9a5c716e947deef8d4cacabbebc6f37ced323a7649aafd8b640692bf341373d7 11796 python3-ascension_0.11.5-1_all.deb Files: - 645068ca353c4dc9b6514a0c89ff1078 846 python optional ascension_0.11.5-1.dsc - 3e3ff56b2cf59aeaca139740e84337fc 11025 python optional ascension_0.11.5.orig.tar.gz - 757f7fefe6063aa5507851a972835ff2 1672 python optional ascension_0.11.5-1.debian.tar.xz - 60d11b44a1f90bbd6b19e4d2dab8ed20 5432 python optional ascension_0.11.5-1_amd64.buildinfo - 52a78ed44b5a5a8d61daf8370f9ec1ca 11790 python optional python3-ascension_0.11.5-1_all.deb + d006836b17cfe5fa8b9eb1212ae12001 846 python optional ascension_0.11.5-1.dsc + 0f665ff382859108057a37aa2f9bd5cf 11038 python optional ascension_0.11.5.orig.tar.gz + d11120597a3487082590bfe282e06966 1668 python optional ascension_0.11.5-1.debian.tar.xz + f3a725dc814cb431ae403375cd07bd87 5432 python optional ascension_0.11.5-1_amd64.buildinfo + 453ed4a0f9fddea44d0e8518ff0bc579 11796 python optional python3-ascension_0.11.5-1_all.deb diff --git a/deb_dist/ascension_0.11.5-1_source.buildinfo b/deb_dist/ascension_0.11.5-1_source.buildinfo index 76f21a5..f08e854 100644 --- a/deb_dist/ascension_0.11.5-1_source.buildinfo +++ b/deb_dist/ascension_0.11.5-1_source.buildinfo @@ -4,14 +4,14 @@ Binary: python3-ascension Architecture: source Version: 0.11.5-1 Checksums-Md5: - 8346b7d76e624a2127b081e2d1d0aa12 846 ascension_0.11.5-1.dsc + 7c3452e7181fede761ac46119abc13e7 846 ascension_0.11.5-1.dsc Checksums-Sha1: - 4c3a692da040fb55894ae8db1cb86e34fbb7e539 846 ascension_0.11.5-1.dsc + af1b549b42bc4620f5210dd85de5768b1b86558c 846 ascension_0.11.5-1.dsc Checksums-Sha256: - fcbdfa13dec81778f4d3e041c267e797781e20b642dc4e7a30a594b314775cd0 846 ascension_0.11.5-1.dsc + 78515d8ee766849fbb8bd7bbc952846b2b4018024f2f451b84e329063832bca0 846 ascension_0.11.5-1.dsc Build-Origin: Debian Build-Architecture: amd64 -Build-Date: Thu, 06 Jun 2019 19:42:30 +0000 +Build-Date: Sun, 09 Jun 2019 22:53:25 +0000 Installed-Build-Depends: autoconf (= 2.69-10), automake (= 1:1.15-6), @@ -174,4 +174,4 @@ Installed-Build-Depends: zlib1g (= 1:1.2.8.dfsg-5) Environment: DEB_BUILD_OPTIONS="parallel=2" - SOURCE_DATE_EPOCH="1559850148" + SOURCE_DATE_EPOCH="1560120798" diff --git a/deb_dist/ascension_0.11.5-1_source.changes b/deb_dist/ascension_0.11.5-1_source.changes index 86172f4..0783eb4 100644 --- a/deb_dist/ascension_0.11.5-1_source.changes +++ b/deb_dist/ascension_0.11.5-1_source.changes @@ -1,5 +1,5 @@ Format: 1.8 -Date: Thu, 06 Jun 2019 19:42:28 +0000 +Date: Sun, 09 Jun 2019 22:53:18 +0000 Source: ascension Binary: python3-ascension Architecture: source @@ -15,17 +15,17 @@ Changes: . * source package automatically created by stdeb 0.8.5 Checksums-Sha1: - 4c3a692da040fb55894ae8db1cb86e34fbb7e539 846 ascension_0.11.5-1.dsc - cc6f1d1a8212d096f3a67ead352ab289331ce1f2 11025 ascension_0.11.5.orig.tar.gz - fb5e9de99d5ace53675e49969639a49f744aa531 1140 ascension_0.11.5-1.debian.tar.xz - 9c0b4d846772c7555becd17acfb267c72689b134 5163 ascension_0.11.5-1_source.buildinfo + af1b549b42bc4620f5210dd85de5768b1b86558c 846 ascension_0.11.5-1.dsc + 82c1e17024c599387c7238a9c05f01cce17c769b 11038 ascension_0.11.5.orig.tar.gz + 71f3809ad03096cca621ab883c78e154173c34bd 1140 ascension_0.11.5-1.debian.tar.xz + 44a329e8f51935bc86c48ee24c69ab641cb29fc2 5163 ascension_0.11.5-1_source.buildinfo Checksums-Sha256: - fcbdfa13dec81778f4d3e041c267e797781e20b642dc4e7a30a594b314775cd0 846 ascension_0.11.5-1.dsc - bdd8f289e9955dc9d06ca9a8e8c6ef3611ab5ddbc9896e7313074c83ff985c34 11025 ascension_0.11.5.orig.tar.gz - c0b38b1974e09244725f5480541a15bab413b60b01ef3f6908fa9f3a3efdd694 1140 ascension_0.11.5-1.debian.tar.xz - 15f5cbececb2b0cd4e9d529163f1d3c5efa07cc1653f48daf62d40f02d8e32a7 5163 ascension_0.11.5-1_source.buildinfo + 78515d8ee766849fbb8bd7bbc952846b2b4018024f2f451b84e329063832bca0 846 ascension_0.11.5-1.dsc + f21f936c303cd0403260b3621000a94ade839300e4cf22dd4e7644f4f3479e62 11038 ascension_0.11.5.orig.tar.gz + 1aed664581b3ba608796ad372af4a39facb25824106d7d6971dba5c93d955301 1140 ascension_0.11.5-1.debian.tar.xz + 9d41198ece37c9b11565802b9ea4320f64c242ee85c80b4f09d5a1362fb8df84 5163 ascension_0.11.5-1_source.buildinfo Files: - 8346b7d76e624a2127b081e2d1d0aa12 846 python optional ascension_0.11.5-1.dsc - 3e3ff56b2cf59aeaca139740e84337fc 11025 python optional ascension_0.11.5.orig.tar.gz - c2e94bf4ac46ee3373a6c6bb25fc7c0f 1140 python optional ascension_0.11.5-1.debian.tar.xz - e9e4c6fb57f9e31f3077e796130c4ac3 5163 python optional ascension_0.11.5-1_source.buildinfo + 7c3452e7181fede761ac46119abc13e7 846 python optional ascension_0.11.5-1.dsc + 0f665ff382859108057a37aa2f9bd5cf 11038 python optional ascension_0.11.5.orig.tar.gz + c3bd83268804f1999f00edaeb6c4393c 1140 python optional ascension_0.11.5-1.debian.tar.xz + 22cc806e69783fce9b97c3648efbe88e 5163 python optional ascension_0.11.5-1_source.buildinfo diff --git a/deb_dist/ascension_0.11.5.orig.tar.gz b/deb_dist/ascension_0.11.5.orig.tar.gz index dfdfda6..6a05fc5 100644 Binary files a/deb_dist/ascension_0.11.5.orig.tar.gz and b/deb_dist/ascension_0.11.5.orig.tar.gz differ diff --git a/deb_dist/python3-ascension_0.11.5-1_all.deb b/deb_dist/python3-ascension_0.11.5-1_all.deb index 0bae818..11c096e 100644 Binary files a/deb_dist/python3-ascension_0.11.5-1_all.deb and b/deb_dist/python3-ascension_0.11.5-1_all.deb differ -- cgit v1.2.3