commit a013178ce73683b2299ccab9068392a6b7adfc03
parent 340037e022ee1b76be1fdb02d7ed728bc57c049c
Author: rexxnor <rexxnor+gnunet@brief.li>
Date: Mon, 3 Jun 2019 14:18:56 +0200
fixed blacklisting
Diffstat:
15 files changed, 59 insertions(+), 56 deletions(-)
diff --git a/ascension-0.11.5.tar.gz b/ascension-0.11.5.tar.gz
Binary files differ.
diff --git a/ascension/ascension.py b/ascension/ascension.py
@@ -57,7 +57,7 @@ import dns.resolver
import dns.zone
import docopt
-# GLOBALS
+# GLOBALS for different environments
GNUNET_ZONE_CREATION_COMMAND = 'gnunet-identity'
GNUNET_NAMESTORE_COMMAND = 'gnunet-namestore'
GNUNET_GNS_COMMAND = 'gnunet-gns'
@@ -75,7 +75,7 @@ SUPPORTED_RECORD_TYPES = [
OBSOLETE_RECORD_TYPES = [
"PTR",
"SIG", "KEY",
- "RRSIG", "NSEC", "DNSKEY", "NSEC3", "NSEC3PARAM", "CDNSKEY", "DS"
+ "RRSIG", "NSEC", "DNSKEY", "NSEC3", "NSEC3PARAM", "CDNSKEY", "DS",
"TKEY", "TSIG",
"TA", "DLV",
]
diff --git a/deb_dist/ascension-0.11.5/ascension/ascension.py b/deb_dist/ascension-0.11.5/ascension/ascension.py
@@ -57,7 +57,7 @@ import dns.resolver
import dns.zone
import docopt
-# GLOBALS
+# GLOBALS for different environments
GNUNET_ZONE_CREATION_COMMAND = 'gnunet-identity'
GNUNET_NAMESTORE_COMMAND = 'gnunet-namestore'
GNUNET_GNS_COMMAND = 'gnunet-gns'
@@ -75,7 +75,7 @@ SUPPORTED_RECORD_TYPES = [
OBSOLETE_RECORD_TYPES = [
"PTR",
"SIG", "KEY",
- "RRSIG", "NSEC", "DNSKEY", "NSEC3", "NSEC3PARAM", "CDNSKEY", "DS"
+ "RRSIG", "NSEC", "DNSKEY", "NSEC3", "NSEC3PARAM", "CDNSKEY", "DS",
"TKEY", "TSIG",
"TA", "DLV",
]
@@ -102,6 +102,7 @@ class Ascender():
self.flags = flags
self.minimum = int(minimum)
self.subzonedict = dict()
+ self.rrsetcount = 0
def bootstrap_zone(self) -> None:
"""
@@ -273,6 +274,7 @@ class Ascender():
# add recordline to gns and filter out empty lines
if len(recordline) > 1:
+ self.rrsetcount += 1
self.add_recordline_to_gns(recordline,
domain,
label)
@@ -779,6 +781,7 @@ def main():
continue
ascender.add_records_to_gns()
+ logging.info("Added %d RRSets", ascender.rrsetcount)
logging.info("Finished migration of the zone %s", ascender.domain)
if __name__ == '__main__':
diff --git 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 <rexxnor+gnunet@brief.li> Sat, 01 Jun 2019 09:39:38 +0000
+ -- rexxnor <rexxnor+gnunet@brief.li> Mon, 03 Jun 2019 12:17:03 +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
@@ -5,7 +5,7 @@ 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
-77d85fa6df18531638272fa529d4bc8d usr/lib/python3/dist-packages/ascension/ascension.py
+e64a2e369d0fa15c15625f1b383dba1a usr/lib/python3/dist-packages/ascension/ascension.py
de060b4ca299c6460ff508aed915526b usr/man/man1/ascension.1
-7c91a24ed761700f79e6e35654a9b5de usr/share/doc/python3-ascension/changelog.Debian.gz
+3fde32fec7c26bfb692fd5795fe5bae8 usr/share/doc/python3-ascension/changelog.Debian.gz
42cbfd228642e598041a4f8583b17259 usr/share/doc/python3-ascension/copyright
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
Binary files differ.
diff --git 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
-# Sat, 01 Jun 2019 09:39:38 +0000
+# Mon, 03 Jun 2019 12:17:03 +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
Binary files differ.
diff --git 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:
- 021defc94aa480b0815a4efaec31daf5a2e2bf88 10652 ascension_0.11.5.orig.tar.gz
- 8516a239f65b3e864e891daab9cf62cc7bd909c1 1888 ascension_0.11.5-1.debian.tar.xz
+ c505f4a33efadcccaad83a4880217a76bb7fd0f1 11056 ascension_0.11.5.orig.tar.gz
+ a28cc1cb517b7ec9717da89e97a4111b1c78aa85 1892 ascension_0.11.5-1.debian.tar.xz
Checksums-Sha256:
- 26ee8a1845b01c92a969bec2ee461f10918873e31018a275bba05b3c40b3821c 10652 ascension_0.11.5.orig.tar.gz
- bbff145e8e3cfd690e39019118337a95939ead0e3c086b046e02677564920c4c 1888 ascension_0.11.5-1.debian.tar.xz
+ aff6025d7f35676701738602560c574e253bb248a18915c654b32325898af33e 11056 ascension_0.11.5.orig.tar.gz
+ a2299ad9433793774d27459963d1a32bdda8ea10ba37facdfbc47be15bb4d953 1892 ascension_0.11.5-1.debian.tar.xz
Files:
- f554e7e84f19fbaafd2219b6be7f6433 10652 ascension_0.11.5.orig.tar.gz
- b657097bc52cf563b551ef8ad95268db 1888 ascension_0.11.5-1.debian.tar.xz
+ 278f98a45d3dbf582561088563b952cc 11056 ascension_0.11.5.orig.tar.gz
+ 1cf08613f9b2be80a571f025e4c67081 1892 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
@@ -4,17 +4,17 @@ Binary: python3-ascension
Architecture: all source
Version: 0.11.5-1
Checksums-Md5:
- 68f13e9a3b13c5fc36242dba5e8d6051 846 ascension_0.11.5-1.dsc
- d68fbb25fb1b9fe79ee4d52ea74ae43b 12074 python3-ascension_0.11.5-1_all.deb
+ be1f8410a8604afce7d5350234d136cc 846 ascension_0.11.5-1.dsc
+ 5bf09d7aa539743c9853f5f9c19db19d 12114 python3-ascension_0.11.5-1_all.deb
Checksums-Sha1:
- 9f96b287c99e40f51a6737b82bde2a3bc596a87f 846 ascension_0.11.5-1.dsc
- 9a0ff5db319f61d51b4075c9d53d6ac466139745 12074 python3-ascension_0.11.5-1_all.deb
+ d92fd96995f4537621f08066725107e60e4651d5 846 ascension_0.11.5-1.dsc
+ d187b4a7dd70ed77be4734ef34879d6ad8cfb0b6 12114 python3-ascension_0.11.5-1_all.deb
Checksums-Sha256:
- b85227d3ea578a1b43599a1c7c9c69ddc0a11961490cf990e12f57cb31c88eff 846 ascension_0.11.5-1.dsc
- aa3a21e1a98299df739c239348a51e4c523945edab968b2980f2c102ab882da1 12074 python3-ascension_0.11.5-1_all.deb
+ aec93f91b3faae23b75161a1e19164e01ef06cba8de3c03d13d9e335e82c4ade 846 ascension_0.11.5-1.dsc
+ 78c65668a7bfe4b52fee9fd84baa68af2410fe3430c8ed457241036971dfcdd0 12114 python3-ascension_0.11.5-1_all.deb
Build-Origin: Debian
Build-Architecture: amd64
-Build-Date: Sat, 01 Jun 2019 09:41:59 +0000
+Build-Date: Mon, 03 Jun 2019 12:18:01 +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="1559381978"
+ SOURCE_DATE_EPOCH="1559564223"
diff --git 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: Sat, 01 Jun 2019 09:39:38 +0000
+Date: Mon, 03 Jun 2019 12:17:03 +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:
- 9f96b287c99e40f51a6737b82bde2a3bc596a87f 846 ascension_0.11.5-1.dsc
- 021defc94aa480b0815a4efaec31daf5a2e2bf88 10652 ascension_0.11.5.orig.tar.gz
- 8516a239f65b3e864e891daab9cf62cc7bd909c1 1888 ascension_0.11.5-1.debian.tar.xz
- 412ec7cf541bbb761997d98122aa08c40b4cc530 5432 ascension_0.11.5-1_amd64.buildinfo
- 9a0ff5db319f61d51b4075c9d53d6ac466139745 12074 python3-ascension_0.11.5-1_all.deb
+ d92fd96995f4537621f08066725107e60e4651d5 846 ascension_0.11.5-1.dsc
+ c505f4a33efadcccaad83a4880217a76bb7fd0f1 11056 ascension_0.11.5.orig.tar.gz
+ a28cc1cb517b7ec9717da89e97a4111b1c78aa85 1892 ascension_0.11.5-1.debian.tar.xz
+ 02abf5f2fa288105697a6335697cfbbeba9cfbb0 5432 ascension_0.11.5-1_amd64.buildinfo
+ d187b4a7dd70ed77be4734ef34879d6ad8cfb0b6 12114 python3-ascension_0.11.5-1_all.deb
Checksums-Sha256:
- b85227d3ea578a1b43599a1c7c9c69ddc0a11961490cf990e12f57cb31c88eff 846 ascension_0.11.5-1.dsc
- 26ee8a1845b01c92a969bec2ee461f10918873e31018a275bba05b3c40b3821c 10652 ascension_0.11.5.orig.tar.gz
- bbff145e8e3cfd690e39019118337a95939ead0e3c086b046e02677564920c4c 1888 ascension_0.11.5-1.debian.tar.xz
- 3d72561a355f8238bfa0cea4022e01a0ee733be8bce35449bd86151ed7dd7abb 5432 ascension_0.11.5-1_amd64.buildinfo
- aa3a21e1a98299df739c239348a51e4c523945edab968b2980f2c102ab882da1 12074 python3-ascension_0.11.5-1_all.deb
+ aec93f91b3faae23b75161a1e19164e01ef06cba8de3c03d13d9e335e82c4ade 846 ascension_0.11.5-1.dsc
+ aff6025d7f35676701738602560c574e253bb248a18915c654b32325898af33e 11056 ascension_0.11.5.orig.tar.gz
+ a2299ad9433793774d27459963d1a32bdda8ea10ba37facdfbc47be15bb4d953 1892 ascension_0.11.5-1.debian.tar.xz
+ f24035835a2005c1603f83d8d32200dbf21d583974b5d914a754cd387153a6df 5432 ascension_0.11.5-1_amd64.buildinfo
+ 78c65668a7bfe4b52fee9fd84baa68af2410fe3430c8ed457241036971dfcdd0 12114 python3-ascension_0.11.5-1_all.deb
Files:
- 68f13e9a3b13c5fc36242dba5e8d6051 846 python optional ascension_0.11.5-1.dsc
- f554e7e84f19fbaafd2219b6be7f6433 10652 python optional ascension_0.11.5.orig.tar.gz
- b657097bc52cf563b551ef8ad95268db 1888 python optional ascension_0.11.5-1.debian.tar.xz
- ccfbcb90eaff8ba47441ca1ae93d8f93 5432 python optional ascension_0.11.5-1_amd64.buildinfo
- d68fbb25fb1b9fe79ee4d52ea74ae43b 12074 python optional python3-ascension_0.11.5-1_all.deb
+ be1f8410a8604afce7d5350234d136cc 846 python optional ascension_0.11.5-1.dsc
+ 278f98a45d3dbf582561088563b952cc 11056 python optional ascension_0.11.5.orig.tar.gz
+ 1cf08613f9b2be80a571f025e4c67081 1892 python optional ascension_0.11.5-1.debian.tar.xz
+ 6d10a8c26b788530aa9e8db50da1b8b3 5432 python optional ascension_0.11.5-1_amd64.buildinfo
+ 5bf09d7aa539743c9853f5f9c19db19d 12114 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
@@ -4,14 +4,14 @@ Binary: python3-ascension
Architecture: source
Version: 0.11.5-1
Checksums-Md5:
- 803e035cea76e62c6911144b190032c1 846 ascension_0.11.5-1.dsc
+ 259da59f6104228e5d80e6db9147ba09 846 ascension_0.11.5-1.dsc
Checksums-Sha1:
- d53c013e5c3a414be1f45712d1353201213ca10d 846 ascension_0.11.5-1.dsc
+ f395caca3ac3d488ae9f06224cad3d469898d2e8 846 ascension_0.11.5-1.dsc
Checksums-Sha256:
- ab0dd8664be9eaf2b4e0cc41ac07079621a812783f0619acec0af742cceffcae 846 ascension_0.11.5-1.dsc
+ 6ac55686d2349de045df07a38cebae73bb42c585a3c0698838b2b02eb37b4607 846 ascension_0.11.5-1.dsc
Build-Origin: Debian
Build-Architecture: amd64
-Build-Date: Sat, 01 Jun 2019 09:39:43 +0000
+Build-Date: Mon, 03 Jun 2019 12:17:06 +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="1559381978"
+ SOURCE_DATE_EPOCH="1559564223"
diff --git 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: Sat, 01 Jun 2019 09:39:38 +0000
+Date: Mon, 03 Jun 2019 12:17:03 +0000
Source: ascension
Binary: python3-ascension
Architecture: source
@@ -15,17 +15,17 @@ Changes:
.
* source package automatically created by stdeb 0.8.5
Checksums-Sha1:
- d53c013e5c3a414be1f45712d1353201213ca10d 846 ascension_0.11.5-1.dsc
- 021defc94aa480b0815a4efaec31daf5a2e2bf88 10652 ascension_0.11.5.orig.tar.gz
- 98e3576c8f5b285643e844fa2a9371eaba196449 1136 ascension_0.11.5-1.debian.tar.xz
- 6d6be63ecc77a8549cb7ecd9df2a78a30734a468 5163 ascension_0.11.5-1_source.buildinfo
+ f395caca3ac3d488ae9f06224cad3d469898d2e8 846 ascension_0.11.5-1.dsc
+ c505f4a33efadcccaad83a4880217a76bb7fd0f1 11056 ascension_0.11.5.orig.tar.gz
+ a1705a3e261a5774d12dfcf435c87c63c817653f 1140 ascension_0.11.5-1.debian.tar.xz
+ 56f34bb9aa0fc338077562a5054569679405f0e8 5163 ascension_0.11.5-1_source.buildinfo
Checksums-Sha256:
- ab0dd8664be9eaf2b4e0cc41ac07079621a812783f0619acec0af742cceffcae 846 ascension_0.11.5-1.dsc
- 26ee8a1845b01c92a969bec2ee461f10918873e31018a275bba05b3c40b3821c 10652 ascension_0.11.5.orig.tar.gz
- 04116d1979c56a7507db221c00d267cbe8aa8401aabde3a34f2e2089f3c155a5 1136 ascension_0.11.5-1.debian.tar.xz
- 7e548325e2513e58092414200e41a30d4af38a00cd69ef313065f3b6dabd1d32 5163 ascension_0.11.5-1_source.buildinfo
+ 6ac55686d2349de045df07a38cebae73bb42c585a3c0698838b2b02eb37b4607 846 ascension_0.11.5-1.dsc
+ aff6025d7f35676701738602560c574e253bb248a18915c654b32325898af33e 11056 ascension_0.11.5.orig.tar.gz
+ d04da0e4c75755175a9da95ef7f830d3cfc1ab192e2f7331fa6789ba7f0e8b3d 1140 ascension_0.11.5-1.debian.tar.xz
+ 9738930d9a96a23aaa5ab556fe54c84036fb83b2c643c3b44ae19171809d4066 5163 ascension_0.11.5-1_source.buildinfo
Files:
- 803e035cea76e62c6911144b190032c1 846 python optional ascension_0.11.5-1.dsc
- f554e7e84f19fbaafd2219b6be7f6433 10652 python optional ascension_0.11.5.orig.tar.gz
- d10dc50ef0e5a2c8a66f02827630eea7 1136 python optional ascension_0.11.5-1.debian.tar.xz
- cf8584d6aa1ef4d6fe6b645f47b45550 5163 python optional ascension_0.11.5-1_source.buildinfo
+ 259da59f6104228e5d80e6db9147ba09 846 python optional ascension_0.11.5-1.dsc
+ 278f98a45d3dbf582561088563b952cc 11056 python optional ascension_0.11.5.orig.tar.gz
+ 781564f75d276d0e39d58739ea2c41b5 1140 python optional ascension_0.11.5-1.debian.tar.xz
+ 35e961fbdf95b5afd3a4b95fe883d8d9 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
Binary files 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
Binary files differ.
