Mercurial > dnsbl

changeset 432:4ffa356316d5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
allow syslogging of long txt records
author Carl Byington <carl@five-ten-sg.com>
date Tue, 24 Oct 2017 08:54:45 -0700
parents cb88e1291ac9
children ad7a378bf5a2
files ChangeLog NEWS configure.in dnsbl.spec.in src/dnsbl.cpp tld.conf
diffstat 6 files changed, 565 insertions(+), 107 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue Oct 03 14:02:32 2017 -0700
+++ b/ChangeLog	Tue Oct 24 08:54:45 2017 -0700
@@ -1,3 +1,6 @@
+6.63 2017-10-24
+    allow syslogging of long txt records
+
 6.62 2017-10-03
     include arpa/nameser.h earlier.
 
--- a/NEWS	Tue Oct 03 14:02:32 2017 -0700
+++ b/NEWS	Tue Oct 24 08:54:45 2017 -0700
@@ -1,3 +1,4 @@
+6.63 2017-10-24 allow syslogging of long txt records
 6.62 2017-10-03 include arpa/nameser.h earlier
 6.61 2017-10-02 allow 4000 byte spf txt records
 6.60 2017-08-18 hosts-ignore.conf can be used to ignore nameserver names
--- a/configure.in	Tue Oct 03 14:02:32 2017 -0700
+++ b/configure.in	Tue Oct 24 08:54:45 2017 -0700
@@ -1,6 +1,6 @@
 
 AC_PREREQ(2.59)
-AC_INIT(dnsbl,6.62,carl@five-ten-sg.com)
+AC_INIT(dnsbl,6.63,carl@five-ten-sg.com)
 AC_CONFIG_SRCDIR([config.h.in])
 AC_CONFIG_HEADER([config.h])
 AC_CONFIG_MACRO_DIR([m4])
--- a/dnsbl.spec.in	Tue Oct 03 14:02:32 2017 -0700
+++ b/dnsbl.spec.in	Tue Oct 24 08:54:45 2017 -0700
@@ -155,6 +155,9 @@
 
 
 %changelog
+* Tue Oct 24 2017 Carl Byington <carl@five-ten-sg.com> - 6.63-1
+- allow syslogging of long txt records
+
 * Tue Oct 03 2017 Carl Byington <carl@five-ten-sg.com> - 6.62-1
 - include arpa/nameser.h earlier
 
--- a/src/dnsbl.cpp	Tue Oct 03 14:02:32 2017 -0700
+++ b/src/dnsbl.cpp	Tue Oct 24 08:54:45 2017 -0700
@@ -94,7 +94,7 @@
 bool loader_run    = true;  // used to stop the config loader thread
 CONFIG   *config = NULL;    // protected by the config_mutex
 int   generation = 0;       // protected by the config_mutex
-const int maxlen = 1000;    // used for snprintf buffers
+const int maxlen = maxdnslength;    // used for snprintf buffers
 regex_t srs_pattern;        // used to detect srs coding in mail addresses
 regex_t prvs_pattern;       // used to detect prvs coding in mail addresses
 regex_t dkim_r_pattern;     // used to detect dkim signatures authenticated by the upstream opendkim milter
--- a/tld.conf	Tue Oct 03 14:02:32 2017 -0700
+++ b/tld.conf	Tue Oct 24 08:54:45 2017 -0700
@@ -1,4 +1,4 @@
-// generated by make-tld-conf.py on 2017-01-12 15:56:03
+// generated by make-tld-conf.py on 2017-10-07 16:53:24
 
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -173,7 +173,7 @@
 // aq : https://en.wikipedia.org/wiki/.aq
 aq
 
-// ar : https://nic.ar/normativa-vigente.xhtml
+// ar : https://nic.ar/nic-argentina/normativa-vigente
 ar
 com.ar
 edu.ar
@@ -181,6 +181,7 @@
 gov.ar
 int.ar
 mil.ar
+musica.ar
 net.ar
 org.ar
 tur.ar
@@ -400,22 +401,30 @@
 // br : http://registro.br/dominio/categoria.html
 // Submitted by registry <fneves@registro.br>
 br
+abc.br
 adm.br
 adv.br
 agr.br
+aju.br
 am.br
+aparecida.br
 arq.br
 art.br
 ato.br
 b.br
+belem.br
 bio.br
 blog.br
 bmd.br
+bsb.br
 cim.br
 cng.br
 cnt.br
 com.br
 coop.br
+cri.br
+cuiaba.br
+def.br
 ecn.br
 eco.br
 edu.br
@@ -426,6 +435,8 @@
 eti.br
 far.br
 flog.br
+floripa.br
+fortal.br
 fm.br
 fnd.br
 fot.br
@@ -433,24 +444,62 @@
 g12.br
 ggf.br
 gov.br
+// gov.br 26 states + df https://en.wikipedia.org/wiki/States_of_Brazil
+ac.gov.br
+al.gov.br
+am.gov.br
+ap.gov.br
+ba.gov.br
+ce.gov.br
+df.gov.br
+es.gov.br
+go.gov.br
+ma.gov.br
+mg.gov.br
+ms.gov.br
+mt.gov.br
+pa.gov.br
+pb.gov.br
+pe.gov.br
+pi.gov.br
+pr.gov.br
+rj.gov.br
+rn.gov.br
+ro.gov.br
+rr.gov.br
+rs.gov.br
+sc.gov.br
+se.gov.br
+sp.gov.br
+to.gov.br
+gru.br
 imb.br
 ind.br
 inf.br
+jampa.br
 jor.br
 jus.br
 leg.br
 lel.br
+londrina.br
+macapa.br
+maceio.br
 mat.br
 med.br
 mil.br
 mp.br
 mus.br
+natal.br
 net.br
+niteroi.br
 *.nom.br
 not.br
 ntr.br
 odo.br
 org.br
+osasco.br
+palmas.br
+poa.br
 ppg.br
 pro.br
 psc.br
@@ -458,6 +507,9 @@
 qsl.br
 radio.br
 rec.br
+recife.br
+riobranco.br
+sjc.br
 slg.br
 srv.br
 taxi.br
@@ -466,7 +518,9 @@
 trd.br
 tur.br
 tv.br
+udi.br
 vet.br
+vix.br
 vlog.br
 wiki.br
 zlg.br
@@ -4481,6 +4535,7 @@
 // nc : http://www.cctld.nc/
 nc
 asso.nc
+nom.nc
 
 // ne : https://en.wikipedia.org/wiki/.ne
 ne
@@ -5529,6 +5584,9 @@
 org.om
 pro.om
 
+// onion : https://tools.ietf.org/html/rfc7686
+// no ns record for onion
+
 // org : https://en.wikipedia.org/wiki/.org
 org
 
@@ -6110,38 +6168,6 @@
 
 // su : https://en.wikipedia.org/wiki/.su
 su
-adygeya.su
-arkhangelsk.su
-balashov.su
-bashkiria.su
-bryansk.su
-dagestan.su
-grozny.su
-ivanovo.su
-kalmykia.su
-kaluga.su
-karelia.su
-khakassia.su
-krasnodar.su
-kurgan.su
-lenug.su
-mordovia.su
-msk.su
-murmansk.su
-nalchik.su
-nov.su
-obninsk.su
-penza.su
-pokrovsk.su
-sochi.su
-spb.su
-togliatti.su
-troitsk.su
-tula.su
-tuva.su
-vladikavkaz.su
-vladimir.su
-vologda.su
 
 // sv : http://www.svnet.org.sv/niveldos.pdf
 sv
@@ -6715,6 +6741,17 @@
 pvt.k12.ma.us
 chtr.k12.ma.us
 paroch.k12.ma.us
+// Merit Network, Inc. maintains the registry for =~ /(k12|cc|lib).mi.us/ and the following
+//    see also: http://domreg.merit.edu
+//    see also: whois -h whois.domreg.merit.edu help
+ann-arbor.mi.us
+cog.mi.us
+dst.mi.us
+eaton.mi.us
+gen.mi.us
+mus.mi.us
+tec.mi.us
+washtenaw.mi.us
 
 // uy : http://www.nic.org.uy/
 uy
@@ -6839,6 +6876,10 @@
 // বাংলা
 xn--54b7fta0cc
 
+// xn--90ae ("bg", Bulgarian) : BG
+// бг
+xn--90ae
+
 // xn--90ais ("bel", Belarusian/Russian Cyrillic) : BY
 // Operated by .by registry
 // бел
@@ -6883,6 +6924,41 @@
 // 香港
 xn--j6w193g
 
+// xn--2scrj9c ("Bharat", Kannada) : IN
+// India
+// ಭಾರತ
+xn--2scrj9c
+
+// xn--3hcrj9c ("Bharat", Oriya) : IN
+// India
+// ଭାରତ
+xn--3hcrj9c
+
+// xn--45br5cyl ("Bharatam", Assamese) : IN
+// India
+// ভাৰত
+xn--45br5cyl
+
+// xn--h2breg3eve ("Bharatam", Sanskrit) : IN
+// India
+// भारतम्
+xn--h2breg3eve
+
+// xn--h2brj9c8c ("Bharot", Santali) : IN
+// India
+// भारोत
+xn--h2brj9c8c
+
+// xn--mgbgu82a ("Bharat", Sindhi) : IN
+// India
+// ڀارت
+xn--mgbgu82a
+
+// xn--rvc1e0am3e ("Bharatam", Malayalam) : IN
+// India
+// ഭാരതം
+xn--rvc1e0am3e
+
 // xn--h2brj9c ("Bharat", Devanagari) : IN
 // India
 // भारत
@@ -6987,7 +7063,7 @@
 
 // xn--mgbai9azgqp6j ("Pakistan", Urdu/Arabic) : PK
 // پاکستان
-// no ns record for xn--mgbai9azgqp6j
+xn--mgbai9azgqp6j
 
 // xn--mgbai9a5eva00b ("Pakistan", Urdu/Arabic, variant) : PK
 // پاكستان
@@ -7068,6 +7144,18 @@
 // http://www.thnic.co.th
 // ไทย
 xn--o3cw4h
+// ศึกษา.ไทย
+xn--12c1fe0br.xn--o3cw4h
+// ธุรกิจ.ไทย
+xn--12co0c3b4eva.xn--o3cw4h
+// รัฐบาล.ไทย
+xn--h3cuzk1di.xn--o3cw4h
+// ทหาร.ไทย
+xn--o3cyx2a.xn--o3cw4h
+// เน็ต.ไทย
+xn--m3ch0j3a.xn--o3cw4h
+// องค์กร.ไทย
+xn--12cfi8ixb8l.xn--o3cw4h
 
 // xn--pgbs0dh ("Tunisia", Arabic) : TN
 // http://nic.tn
@@ -7136,11 +7224,16 @@
 org.zm
 sch.zm
 
-// zw : https://en.wikipedia.org/wiki/.zw
-*.zw
-
-
-// List of new gTLDs imported from https://newgtlds.icann.org/newgtlds.csv on 2016-11-29T01:06:51Z
+// zw : https://www.potraz.gov.zw/
+// Confirmed by registry <bmtengwa@potraz.gov.zw> 2017-01-25
+zw
+ac.zw
+co.zw
+gov.zw
+mil.zw
+org.zw
+
+// List of new gTLDs imported from https://newgtlds.icann.org/newgtlds.csv on 2017-02-23T00:46:09Z
 
 // aaa : 2015-02-26 American Automobile Association, Inc.
 aaa
@@ -7215,7 +7308,7 @@
 afl
 
 // africa : 2014-03-24 ZA Central Registry NPC trading as Registry.Africa
-// no ns record for africa
+africa
 
 // agakhan : 2015-04-23 Fondation Aga Khan (Aga Khan Foundation)
 agakhan
@@ -7311,7 +7404,7 @@
 aquarelle
 
 // arab : 2015-11-12 League of Arab States
-// no ns record for arab
+arab
 
 // aramco : 2014-11-20 Aramco Services Company
 aramco
@@ -7737,7 +7830,7 @@
 chintai
 
 // chloe : 2014-10-16 Richemont DNS Inc.
-chloe
+// no ns record for chloe
 
 // christmas : 2013-11-21 Uniregistry, Corp.
 christmas
@@ -8072,9 +8165,6 @@
 // dvr : 2016-05-26 Hughes Satellite Systems Corporation
 dvr
 
-// dwg : 2015-07-23 Autodesk, Inc.
-// no ns record for dwg
-
 // earth : 2014-12-04 Interlink Co., Ltd.
 earth
 
@@ -8133,7 +8223,7 @@
 esurance
 
 // etisalat : 2015-09-03 Emirates Telecommunications Corporation (trading as Etisalat)
-// no ns record for etisalat
+etisalat
 
 // eurovision : 2014-04-24 European Broadcasting Union (EBU)
 eurovision
@@ -8472,7 +8562,7 @@
 gripe
 
 // grocery : 2016-06-16 Wal-Mart Stores, Inc.
-// no ns record for grocery
+grocery
 
 // group : 2014-08-15 Romeo Town, LLC
 group
@@ -8598,7 +8688,7 @@
 hoteles
 
 // hotels : 2016-04-07 Booking.com B.V.
-// no ns record for hotels
+hotels
 
 // hotmail : 2014-12-18 Microsoft Corporation
 hotmail
@@ -8642,9 +8732,6 @@
 // ifm : 2014-01-30 ifm electronic gmbh
 ifm
 
-// iinet : 2014-07-03 Connect West Pty. Ltd.
-// no ns record for iinet
-
 // ikano : 2015-07-09 Ikano S.A.
 ikano
 
@@ -9045,7 +9132,7 @@
 mango
 
 // map : 2016-06-09 Charleston Road Registry Inc.
-// no ns record for map
+map
 
 // market : 2014-03-06
 market
@@ -9072,10 +9159,10 @@
 mba
 
 // mcd : 2015-07-30 McDonald’s Corporation
-mcd
+// no ns record for mcd
 
 // mcdonalds : 2015-07-30 McDonald’s Corporation
-mcdonalds
+// no ns record for mcdonalds
 
 // mckinsey : 2015-07-31 McKinsey Holdings, Inc.
 mckinsey
@@ -9108,7 +9195,7 @@
 meo
 
 // merckmsd : 2016-07-14 MSD Registry Holdings, Inc.
-// no ns record for merckmsd
+merckmsd
 
 // metlife : 2015-05-07 MetLife Services and Solutions, LLC
 metlife
@@ -9168,7 +9255,7 @@
 monster
 
 // montblanc : 2014-06-23 Richemont DNS Inc.
-montblanc
+// no ns record for montblanc
 
 // mopar : 2015-07-30 FCA US LLC.
 mopar
@@ -9204,7 +9291,7 @@
 mtn
 
 // mtpc : 2014-11-20 Mitsubishi Tanabe Pharma Corporation
-mtpc
+// no ns record for mtpc
 
 // mtr : 2015-03-12 MTR Corporation Limited
 mtr
@@ -9212,9 +9299,6 @@
 // mutual : 2015-04-02 Northwestern Mutual MU TLD Registry, LLC
 mutual
 
-// mutuelle : 2015-06-18 Fédération Nationale de la Mutualité Française
-// no ns record for mutuelle
-
 // nab : 2015-08-20 National Australia Bank Limited
 nab
 
@@ -9386,9 +9470,6 @@
 // organic : 2014-03-27 Afilias Limited
 organic
 
-// orientexpress : 2015-02-05
-orientexpress
-
 // origins : 2015-10-01 The Estée Lauder Companies Inc.
 origins
 
@@ -9408,7 +9489,7 @@
 page
 
 // pamperedchef : 2015-02-05 The Pampered Chef, Ltd.
-pamperedchef
+// no ns record for pamperedchef
 
 // panasonic : 2015-07-30 Panasonic Corporation
 panasonic
@@ -9450,7 +9531,7 @@
 pharmacy
 
 // phd : 2016-07-28 Charleston Road Registry Inc.
-// no ns record for phd
+phd
 
 // philips : 2014-11-07 Koninklijke Philips N.V.
 philips
@@ -9713,6 +9794,9 @@
 // rsvp : 2014-05-08 Charleston Road Registry Inc.
 rsvp
 
+// rugby : 2016-12-15 World Rugby Strategic Developments Limited
+rugby
+
 // ruhr : 2013-10-02 regiodot GmbH & Co. KG
 ruhr
 
@@ -9819,7 +9903,7 @@
 scot
 
 // search : 2016-06-09 Charleston Road Registry Inc.
-// no ns record for search
+search
 
 // seat : 2014-05-22 SEAT, S.A. (Sociedad Unipersonal)
 seat
@@ -10139,9 +10223,6 @@
 // theatre : 2015-05-07
 theatre
 
-// theguardian : 2015-04-30 Guardian News and Media Limited
-// no ns record for theguardian
-
 // tiaa : 2015-07-23 Teachers Insurance and Annuity Association of America
 tiaa
 
@@ -10289,7 +10370,7 @@
 // verisign : 2015-08-13 VeriSign, Inc.
 verisign
 
-// versicherung : 2014-03-20 dotversicherung-registry GmbH
+// versicherung : 2014-03-20
 versicherung
 
 // vet : 2014-03-06
@@ -10525,10 +10606,6 @@
 // موقع
 xn--4gbrim
 
-// xn--4gq48lf9j : 2015-07-31 Wal-Mart Stores, Inc.
-// 一号店
-// no ns record for xn--4gq48lf9j
-
 // xn--55qw42g : 2013-11-08 China Organizational Name Administration Center
 // 公益
 xn--55qw42g
@@ -10609,7 +10686,7 @@
 // 삼성
 xn--cg4bki
 
-// xn--czr694b : 2014-01-16 Dot Trademark TLD Holding Company Limted
+// xn--czr694b : 2014-01-16 Dot Trademark TLD Holding Company Limited
 // 商标
 xn--czr694b
 
@@ -10685,7 +10762,7 @@
 // संगठन
 xn--i1b6b1a6a2e
 
-// xn--imr513n : 2014-12-11 Dot Trademark TLD Holding Company Limted
+// xn--imr513n : 2014-12-11 Dot Trademark TLD Holding Company Limited
 // 餐厅
 xn--imr513n
 
@@ -10727,7 +10804,7 @@
 
 // xn--mgbaakc7dvf : 2015-09-03 Emirates Telecommunications Corporation (trading as Etisalat)
 // اتصالات
-// no ns record for xn--mgbaakc7dvf
+xn--mgbaakc7dvf
 
 // xn--mgbab2bd : 2013-10-31 CORE Association
 // بازار
@@ -10767,7 +10844,7 @@
 
 // xn--ngbrx : 2015-11-12 League of Arab States
 // عرب
-// no ns record for xn--ngbrx
+xn--ngbrx
 
 // xn--nqv7f : 2013-11-14 Public Interest Registry
 // 机构
@@ -10923,6 +11000,12 @@
 // ===BEGIN PRIVATE DOMAINS===
 // (Note: these are in alphabetical order by company name)
 
+// 1GB LLC : https://www.1gb.ua/
+// Submitted by 1GB LLC <noc@1gb.com.ua>
+cc.ua
+inf.ua
+ltd.ua
+
 // Agnat sp. z o.o. : https://domena.pl
 // Submitted by Przemyslaw Plewa <it-admin@domena.pl>
 beep.pl
@@ -10949,8 +11032,23 @@
 
 // Amazon Elastic Beanstalk : https://aws.amazon.com/elasticbeanstalk/
 // Submitted by Luke Wells <psl-maintainers@amazon.com>
-elasticbeanstalk.cn-north-1.amazonaws.com.cn
-*.elasticbeanstalk.com
+cn-north-1.eb.amazonaws.com.cn
+elasticbeanstalk.com
+ap-northeast-1.elasticbeanstalk.com
+ap-northeast-2.elasticbeanstalk.com
+ap-south-1.elasticbeanstalk.com
+ap-southeast-1.elasticbeanstalk.com
+ap-southeast-2.elasticbeanstalk.com
+ca-central-1.elasticbeanstalk.com
+eu-central-1.elasticbeanstalk.com
+eu-west-1.elasticbeanstalk.com
+eu-west-2.elasticbeanstalk.com
+sa-east-1.elasticbeanstalk.com
+us-east-1.elasticbeanstalk.com
+us-east-2.elasticbeanstalk.com
+us-gov-west-1.elasticbeanstalk.com
+us-west-1.elasticbeanstalk.com
+us-west-2.elasticbeanstalk.com
 
 // Amazon Elastic Load Balancing : https://aws.amazon.com/elasticloadbalancing/
 // Submitted by Luke Wells <psl-maintainers@amazon.com>
@@ -10959,7 +11057,7 @@
 
 // Amazon S3 : https://aws.amazon.com/s3/
 // Submitted by Luke Wells <psl-maintainers@amazon.com>
-*.s3.amazonaws.com
+s3.amazonaws.com
 s3-ap-northeast-1.amazonaws.com
 s3-ap-northeast-2.amazonaws.com
 s3-ap-south-1.amazonaws.com
@@ -10968,6 +11066,7 @@
 s3-ca-central-1.amazonaws.com
 s3-eu-central-1.amazonaws.com
 s3-eu-west-1.amazonaws.com
+s3-eu-west-2.amazonaws.com
 s3-external-1.amazonaws.com
 s3-fips-us-gov-west-1.amazonaws.com
 s3-sa-east-1.amazonaws.com
@@ -10980,6 +11079,7 @@
 s3.cn-north-1.amazonaws.com.cn
 s3.ca-central-1.amazonaws.com
 s3.eu-central-1.amazonaws.com
+s3.eu-west-2.amazonaws.com
 s3.us-east-2.amazonaws.com
 s3.dualstack.ap-northeast-1.amazonaws.com
 s3.dualstack.ap-northeast-2.amazonaws.com
@@ -10989,6 +11089,7 @@
 s3.dualstack.ca-central-1.amazonaws.com
 s3.dualstack.eu-central-1.amazonaws.com
 s3.dualstack.eu-west-1.amazonaws.com
+s3.dualstack.eu-west-2.amazonaws.com
 s3.dualstack.sa-east-1.amazonaws.com
 s3.dualstack.us-east-1.amazonaws.com
 s3.dualstack.us-east-2.amazonaws.com
@@ -11004,6 +11105,7 @@
 s3-website.ap-south-1.amazonaws.com
 s3-website.ca-central-1.amazonaws.com
 s3-website.eu-central-1.amazonaws.com
+s3-website.eu-west-2.amazonaws.com
 s3-website.us-east-2.amazonaws.com
 
 // Amune : https://amune.org/
@@ -11034,6 +11136,11 @@
 // Submitted by Andreas Weise <a.weise@avm.de>
 myfritz.net
 
+// AW AdvisorWebsites.com Software Inc : https://advisorwebsites.com
+// Submitted by James Kennedy <domains@advisorwebsites.com>
+*.awdev.ca
+*.advisor.ws
+
 // backplane : https://www.backplane.io
 // Submitted by Anthony Voutas <anthony@backplane.io>
 backplaneapp.io
@@ -11046,10 +11153,23 @@
 // Submitted by Nathan O'Sullivan <nathan@mammoth.com.au>
 bnr.la
 
+// Boomla : https://boomla.com
+// Submitted by Tibor Halter <thalter@boomla.com>
+boomla.net
+
 // Boxfuse : https://boxfuse.com
 // Submitted by Axel Fontaine <axel@boxfuse.com>
 boxfuse.io
 
+// bplaced : https://www.bplaced.net/
+// Submitted by Miroslav Bozic <security@bplaced.net>
+square7.ch
+bplaced.com
+bplaced.de
+square7.de
+bplaced.net
+square7.net
+
 // BrowserSafetyMark
 // Submitted by Dave Tharp <browsersafetymark.io@quicinc.com>
 browsersafetymark.io
@@ -11124,6 +11244,18 @@
 // Submitted by Leon Rowland <leon@clearvox.nl>
 virtueeldomein.nl
 
+// Cloud66 : https://www.cloud66.com/
+// Submitted by Khash Sajadi <khash@cloud66.com>
+c66.me
+
+// CloudAccess.net : https://www.cloudaccess.net/
+// Submitted by Pawel Panek <noc@cloudaccess.net>
+jdevcloud.com
+wpdevcloud.com
+cloudaccess.host
+freesite.host
+cloudaccess.net
+
 // cloudControl : https://www.cloudcontrol.com/
 // Submitted by Tobias Wilken <tw@cloudcontrol.com>
 cloudcontrolled.com
@@ -11162,11 +11294,7 @@
 co.nl
 co.no
 
-// Commerce Guys, SAS
-// Submitted by Damien Tournoud <damien@commerceguys.com>
-*.platform.sh
-
-// COSIMO GmbH http://www.cosimo.de
+// COSIMO GmbH : http://www.cosimo.de
 // Submitted by Rene Marticke <rmarticke@cosimo.de>
 dyn.cosidns.de
 dynamisches-dns.de
@@ -11198,6 +11326,7 @@
 // Daplie, Inc : https://daplie.com
 // Submitted by AJ ONeal <aj@daplie.com>
 daplie.me
+localhost.daplie.me
 
 // Dansk.net : http://www.dansk.net/
 // Submitted by Anani Voule <digital@digital.co.dk>
@@ -11207,6 +11336,10 @@
 reg.dk
 store.dk
 
+// Debian : https://www.debian.org/
+// Submitted by Peter Palfrader / Debian Sysadmin Team <dsa-publicsuffixlist@debian.org>
+debian.net
+
 // deSEC : https://desec.io/
 // Submitted by Peter Thomassen <peter@desec.io>
 dedyn.io
@@ -11215,6 +11348,10 @@
 // Submitted by Norbert Auler <mail@dnshome.de>
 dnshome.de
 
+// DrayTek Corp. : https://www.draytek.com/
+// Submitted by Paul Fang <mis@draytek.com>
+drayddns.com
+
 // DreamHost : http://www.dreamhost.com/
 // Submitted by Andrew Farmer <andrew.farmer@dreamhost.com>
 dreamhosters.com
@@ -11530,14 +11667,43 @@
 myhome-server.de
 ddnss.org
 
+// Definima : http://www.definima.com/
+// Submitted by Maxence Bitterli <maxence@definima.com>
+definima.net
+definima.io
+
+// Dynu.com : https://www.dynu.com/
+// Submitted by Sue Ye <sue@dynu.com>
+ddnsfree.com
+ddnsgeek.com
+giize.com
+gleeze.com
+kozow.com
+loseyourip.com
+ooguy.com
+theworkpc.com
+casacam.net
+dynu.net
+accesscam.org
+camdvr.org
+freeddns.org
+mywire.org
+webredirect.org
+myddns.rocks
+blogsite.xyz
+
 // dynv6 : https://dynv6.com
-// Submitted by Dominik Menke <dom@digineo.de> 2016-01-18
+// Submitted by Dominik Menke <dom@digineo.de>
 dynv6.net
 
 // E4YOU spol. s.r.o. : https://e4you.cz/
 // Submitted by Vladimir Dudr <info@e4you.cz>
 e4.cz
 
+// Enalean SAS: https://www.enalean.com
+// Submitted by Thomas Cottier <thomas.cottier@enalean.com>
+mytuleap.com
+
 // Enonic : http://enonic.com/
 // Submitted by Erik Kaareng-Sunde <esu@enonic.com>
 enonic.io
@@ -11606,25 +11772,131 @@
 // Submitted by Michal Kralik <support@evennode.com>
 eu-1.evennode.com
 eu-2.evennode.com
+eu-3.evennode.com
+eu-4.evennode.com
 us-1.evennode.com
 us-2.evennode.com
+us-3.evennode.com
+us-4.evennode.com
+
+// eDirect Corp. : https://hosting.url.com.tw/
+// Submitted by C.S. chang <cschang@corp.url.com.tw>
+twmail.cc
+twmail.net
+twmail.org
+mymailer.com.tw
+url.tw
 
 // Facebook, Inc.
 // Submitted by Peter Ruibal <public-suffix@fb.com>
 apps.fbsbx.com
 
-// Fastly Inc. http://www.fastly.com/
-// Submitted by Vladimir Vuksan <vladimir@fastly.com>
+// FAITID : https://faitid.org/
+// Submitted by Maxim Alzoba <tech.contact@faitid.org>
+// https://www.flexireg.net/stat_info
+ru.net
+adygeya.ru
+bashkiria.ru
+bir.ru
+cbg.ru
+com.ru
+dagestan.ru
+grozny.ru
+kalmykia.ru
+kustanai.ru
+marine.ru
+mordovia.ru
+msk.ru
+mytis.ru
+nalchik.ru
+nov.ru
+pyatigorsk.ru
+spb.ru
+vladikavkaz.ru
+vladimir.ru
+abkhazia.su
+adygeya.su
+aktyubinsk.su
+arkhangelsk.su
+armenia.su
+ashgabad.su
+azerbaijan.su
+balashov.su
+bashkiria.su
+bryansk.su
+bukhara.su
+chimkent.su
+dagestan.su
+east-kazakhstan.su
+exnet.su
+georgia.su
+grozny.su
+ivanovo.su
+jambyl.su
+kalmykia.su
+kaluga.su
+karacol.su
+karaganda.su
+karelia.su
+khakassia.su
+krasnodar.su
+kurgan.su
+kustanai.su
+lenug.su
+mangyshlak.su
+mordovia.su
+msk.su
+murmansk.su
+nalchik.su
+navoi.su
+north-kazakhstan.su
+nov.su
+obninsk.su
+penza.su
+pokrovsk.su
+sochi.su
+spb.su
+tashkent.su
+termez.su
+togliatti.su
+troitsk.su
+tselinograd.su
+tula.su
+tuva.su
+vladikavkaz.su
+vladimir.su
+vologda.su
+
+// Fancy Bits, LLC : http://getchannels.com
+// Submitted by Aman Gupta <aman@getchannels.com>
+channelsdvr.net
+
+// Fastly Inc. : http://www.fastly.com/
+// Submitted by Fastly Security <security@fastly.com>
+fastlylb.net
+map.fastlylb.net
+freetls.fastly.net
+map.fastly.net
+a.prod.fastly.net
+global.prod.fastly.net
 a.ssl.fastly.net
 b.ssl.fastly.net
 global.ssl.fastly.net
-a.prod.fastly.net
-global.prod.fastly.net
 
 // Featherhead : https://featherhead.xyz/
 // Submitted by Simon Menke <simon@featherhead.xyz>
 fhapp.xyz
 
+// Fedora : https://fedoraproject.org/
+// submitted by Patrick Uiterwijk <puiterwijk@fedoraproject.org>
+fedorainfracloud.org
+fedorapeople.org
+cloud.fedoraproject.org
+
+// Filegear Inc. : https://www.filegear.com
+// Submitted by Jason Zhu <jason@owtware.com>
+filegear.me
+
 // Firebase, Inc.
 // Submitted by Chris Raynor <chris@firebase.com>
 firebaseapp.com
@@ -11632,6 +11904,7 @@
 // Flynn : https://flynn.io
 // Submitted by Jonathan Rudenberg <jonathan@flynn.io>
 flynnhub.com
+flynnhosting.net
 
 // Freebox : http://www.freebox.fr
 // Submitted by Romain Fliedel <rfliedel@freebox.fr>
@@ -11648,6 +11921,7 @@
 
 // Futureweb OG : http://www.futureweb.at
 // Submitted by Andreas Schnederle-Wagner <schnederle@futureweb.at>
+*.futurecms.at
 futurehosting.at
 futuremailing.at
 *.ex.ortsinfo.at
@@ -11662,11 +11936,6 @@
 // Submitted by Patrick Toomey <security@github.com>
 github.io
 githubusercontent.com
-githubcloud.com
-*.api.githubcloud.com
-*.ext.githubcloud.com
-gist.githubcloud.com
-*.githubcloudusercontent.com
 
 // GitLab, Inc.
 // Submitted by Alex Hanselka <alex@gitlab.com>
@@ -11764,6 +12033,7 @@
 blogspot.ug
 blogspot.vn
 cloudfunctions.net
+cloud.goog
 codespot.com
 googleapis.com
 googlecode.com
@@ -11788,6 +12058,10 @@
 herokuapp.com
 herokussl.com
 
+// Ici la Lune : http://www.icilalune.com/
+// Submitted by Simon Morvan <simon@icilalune.com>
+moonscale.net
+
 // iki.fi
 // Submitted by Hannu Aronsson <haa@iki.fi>
 iki.fi
@@ -11796,6 +12070,10 @@
 biz.at
 info.at
 
+// info.cx : http://info.cx
+// Submitted by Jacob Slater <whois@igloo.to>
+info.cx
+
 // Interlegis : http://www.interlegis.leg.br
 // Submitted by Gabriel Ferreira <registrobr@interlegis.leg.br>
 ac.leg.br
@@ -11826,6 +12104,14 @@
 sp.leg.br
 to.leg.br
 
+// intermetrics GmbH : https://pixolino.com/
+// Submitted by Wolfgang Schwarz <admin@intermetrics.de>
+pixolino.com
+
+// IPiFony Systems, Inc. : https://www.ipifony.com/
+// Submitted by Matthew Hardeman <mhardeman@ipifony.com>
+ipifony.net
+
 // Joyent : https://www.joyent.com/
 // Submitted by Brian Bennett <brian.bennett@joyent.com>
 *.triton.zone
@@ -11847,10 +12133,40 @@
 co.krd
 edu.krd
 
+// LCube - Professional hosting e.K. : https://www.lcube-webhosting.de
+// Submitted by Lars Laehn <info@lcube.de>
+git-repos.de
+lcube-server.de
+svn-repos.de
+
+// LiquidNet Ltd : http://www.liquidnetlimited.com/
+// Submitted by Victor Velchev <admin@liquidnetlimited.com>
+we.bs
+
+// Lukanet Ltd : https://lukanet.com
+// Submitted by Anton Avramov <register@lukanet.com>
+barsy.bg
+barsyonline.com
+barsy.de
+barsy.eu
+barsy.in
+barsy.net
+barsy.online
+barsy.support
+
 // Magento Commerce
 // Submitted by Damien Tournoud <dtournoud@magento.cloud>
 *.magentosite.cloud
 
+// Mail.Ru Group : https://hb.cldmail.ru
+// Submitted by Ilya Zaretskiy <zaretskiy@corp.mail.ru>
+hb.cldmail.ru
+
+// MetaCentrum, CESNET z.s.p.o. : https://www.metacentrum.cz/en/
+// Submitted by Zdeněk Šustr <zdenek.sustr@cesnet.cz>
+cloud.metacentrum.cz
+custom.metacentrum.cz
+
 // Meteor Development Group : https://www.meteor.com/hosting
 // Submitted by Pierre Carrier <pierre@meteor.com>
 meteorapp.com
@@ -11869,6 +12185,17 @@
 // Submitted by glob <glob@mozilla.com>
 bmoattachments.org
 
+// MSK-IX : https://www.msk-ix.ru/
+// Submitted by Khannanov Roman <r.khannanov@msk-ix.ru>
+net.ru
+org.ru
+pp.ru
+
+// Netlify : https://www.netlify.com
+// Submitted by Jessica Parsons <jessica@netlify.com>
+bitballoon.com
+netlify.com
+
 // Neustar Inc.
 // Submitted by Trung Tran <Trung.Tran@neustar.biz>
 4u.com
@@ -11974,10 +12301,63 @@
 webhop.me
 zapto.org
 
+// NodeArt : https://nodeart.io
+// Submitted by Konstantin Nosov <Nosov@nodeart.io>
+stage.nodeart.io
+
+// Nodum B.V. : https://nodum.io/
+// Submitted by Wietse Wind <hello+publicsuffixlist@nodum.io>
+nodum.co
+nodum.io
+
 // NYC.mn : http://www.information.nyc.mn
 // Submitted by Matthew Brown <mattbrown@nyc.mn>
 nyc.mn
 
+// NymNom : https://nymnom.com/
+// Submitted by Dave McCormack <dave.mccormack@nymnom.com>
+nom.ae
+nom.ai
+nom.al
+nym.by
+nym.bz
+nom.cl
+nom.gd
+nom.gl
+nym.gr
+nom.gt
+nom.hn
+nom.im
+nym.kz
+nym.la
+nom.li
+nym.li
+nym.lt
+nym.lu
+nym.me
+nom.mk
+nym.mx
+nom.nu
+nym.nz
+nym.pe
+nym.pt
+nom.pw
+nom.qa
+nom.rs
+nom.si
+nym.sk
+nym.su
+nym.sx
+nym.tw
+nom.ug
+nom.uy
+nom.vc
+nom.vg
+
+// Octopodal Solutions, LLC. : https://ulterius.io/
+// Submitted by Andrew Sampson <andrew@ulterius.io>
+cya.gg
+
 // One Fold Media : http://www.onefoldmedia.com/
 // Submitted by Eddie Jones <eddie@onefoldmedia.com>
 nid.io
@@ -12031,6 +12411,11 @@
 // Submitted by Frédéric VANNIÈRE <f.vanniere@planet-work.com>
 on-web.fr
 
+// Platform.sh : https://platform.sh
+// Submitted by Nikola Kotur <nikola@platform.sh>
+*.platform.sh
+*.platformsh.site
+
 // prgmr.com : https://prgmr.com/
 // Submitted by Sarah Newman <owner@prgmr.com>
 xen.prgmr.com
@@ -12046,6 +12431,7 @@
 // Publication Presse Communication SARL : https://ppcom.fr
 // Submitted by Yaacov Akiba Slama <admin@chirurgiens-dentistes-en-france.fr>
 chirurgiens-dentistes-en-france.fr
+byen.site
 
 // QA2
 // Submitted by Daniel Dent (https://www.danieldent.com/)
@@ -12057,6 +12443,15 @@
 alpha-myqnapcloud.com
 myqnapcloud.com
 
+// Quip : https://quip.com
+// Submitted by Patrick Linehan <plinehan@quip.com>
+*.quipelements.com
+
+// Qutheory LLC : http://qutheory.io
+// Submitted by Jonas Schwartz <jonas@qutheory.io>
+vapor.cloud
+vaporcloud.io
+
 // Rackmaze LLC : https://www.rackmaze.com
 // Submitted by Kirill Pertsev <kika@rackmaze.com>
 rackmaze.com
@@ -12098,6 +12493,10 @@
 myfirewall.org
 spdns.org
 
+// SensioLabs, SAS : https://sensiolabs.com/
+// Submitted by Fabien Potencier <fabien.potencier@sensiolabs.com>
+*.sensiosite.cloud
+
 // Service Online LLC : http://drs.ua/
 // Submitted by Serhii Bulakh <support@drs.ua>
 biz.ua
@@ -12145,6 +12544,14 @@
 // Submitted by Lina He <info@stackspace.io>
 stackspace.space
 
+// Storj Labs Inc. : https://storj.io/
+// Submitted by Philip Hutchins <hostmaster@storj.io>
+storj.farm
+
+// Sub 6 Limited: http://www.sub6.com
+// Submitted by Dan Miller <dm@sub6.com>
+temp-dns.com
+
 // Synology, Inc. : https://www.synology.com/
 // Submitted by Rony Weng <ronyweng@synology.com>
 diskstation.me
@@ -12160,6 +12567,7 @@
 i234.me
 myds.me
 synology.me
+vpnplus.to
 
 // TAIFUN Software AG : http://taifun-software.de
 // Submitted by Bjoern Henke <dev-server@taifun-software.de>
@@ -12172,11 +12580,40 @@
 med.pl
 sopot.pl
 
+// Thingdust AG : https://thingdust.com/
+// Submitted by Adrian Imboden <adi@thingdust.com>
+cust.dev.thingdust.io
+cust.disrec.thingdust.io
+cust.prod.thingdust.io
+cust.testing.thingdust.io
+
 // TownNews.com : http://www.townnews.com
 // Submitted by Dustin Ward <dward@townnews.com>
 bloxcms.com
 townnews-staging.com
 
+// TrafficPlex GmbH : https://www.trafficplex.de/
+// Submitted by Phillipp Röll <phillipp.roell@trafficplex.de>
+12hp.at
+2ix.at
+4lima.at
+lima-city.at
+12hp.ch
+2ix.ch
+4lima.ch
+lima-city.ch
+trafficplex.cloud
+de.cool
+12hp.de
+2ix.de
+4lima.de
+lima-city.de
+1337.pictures
+clan.rip
+lima-city.rocks
+webspace.rocks
+lima.zone
+
 // TransIP : htts://www.transip.nl
 // Submitted by Rory Breuk <rbreuk@transip.nl>
 *.transurl.be
@@ -12203,6 +12640,10 @@
 synology-diskstation.de
 synology-ds.de
 
+// Uberspace : https://uberspace.de
+// Submitted by Moritz Werner <mwerner@jonaspasche.com>
+uber.space
+
 // UDR Limited : http://www.udr.hk.com
 // Submitted by registry <hostmaster@udr.hk.com>
 hk.com
@@ -12218,6 +12659,16 @@
 // Submitted by Simon Kissel <hostmaster@viprinet.com>
 router.management
 
+// Virtual-Info : https://www.virtual-info.info/
+// Submitted by Adnan RIHAN <hostmaster@v-info.info>
+v-info.info
+
+// WeDeploy by Liferay, Inc. : https://www.wedeploy.com
+// Submitted by Henrique Vicente <security@wedeploy.com>
+wedeploy.io
+wedeploy.me
+wedeploy.sh
+
 // Western Digital Technologies, Inc : https://www.wdc.com
 // Submitted by Jung Jin <jungseok.jin@wdc.com>
 remotewd.com
@@ -12226,6 +12677,12 @@
 // Submitted by Yuvi Panda <yuvipanda@wikimedia.org>
 wmflabs.org
 
+// XS4ALL Internet bv : https://www.xs4all.nl/
+// Submitted by Daniel Mostertman <unixbeheer+publicsuffix@xs4all.net>
+cistron.nl
+demon.nl
+xs4all.space
+
 // Yola : https://www.yola.com/
 // Submitted by Stefano Rivera <stefano@yola.com>
 yolasite.com
@@ -12249,12 +12706,6 @@
 // Submitted by Olli Vanhoja <olli@zeit.co>
 now.sh
 
-// 1GB LLC : https://www.1gb.ua/
-// Submitted by 1GB LLC <noc@1gb.com.ua>
-cc.ua
-inf.ua
-ltd.ua
-
 // ===END PRIVATE DOMAINS===
 
 // enable rdns as a tld, so *.reverse.softlayer.com is effective in the rpz zone