From 4aacecc318f4f99505337ce94457bc00b7bf542a Mon Sep 17 00:00:00 2001 From: Daniel McCarney Date: Wed, 16 May 2018 13:45:39 -0400 Subject: [PATCH] Godeps: Update `weppos/publicsuffix-go` to 67ec7c1. (#3717) This commit updates the `github.com/weppos/publicsuffix-go` dependency to 67ec7c1, the tip of master at the time of writing. Unit tests are verified to pass: ``` $ go test ./... ? github.com/weppos/publicsuffix-go/cmd/load [no test files] ok github.com/weppos/publicsuffix-go/net/publicsuffix (cached) ok github.com/weppos/publicsuffix-go/publicsuffix (cached) ``` --- Godeps/Godeps.json | 4 +- .../publicsuffix-go/publicsuffix/rules.go | 147 +++++++++++++++++- 2 files changed, 145 insertions(+), 6 deletions(-) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 44417fe7a..51ba19737 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -414,8 +414,8 @@ }, { "ImportPath": "github.com/weppos/publicsuffix-go/publicsuffix", - "Comment": "v0.4.0-8-g542377b", - "Rev": "542377b4412b209bdfc880fd4d698f7fd171aa5e" + "Comment": "v0.4.0-13-g67ec7c1", + "Rev": "67ec7c1b9678b719e579f2118c36fca4e11a0fb1" }, { "ImportPath": "golang.org/x/crypto/cryptobyte", diff --git a/vendor/github.com/weppos/publicsuffix-go/publicsuffix/rules.go b/vendor/github.com/weppos/publicsuffix-go/publicsuffix/rules.go index c74317c23..34db1f580 100644 --- a/vendor/github.com/weppos/publicsuffix-go/publicsuffix/rules.go +++ b/vendor/github.com/weppos/publicsuffix-go/publicsuffix/rules.go @@ -3,10 +3,10 @@ package publicsuffix -const defaultListVersion = "PSL version 03b8ff (Tue Apr 17 23:32:48 2018)" +const defaultListVersion = "PSL version 53ef89 (Mon May 14 15:36:24 2018)" func init() { - r := [8463]Rule{ + r := [8602]Rule{ {1, "ac", 1, false}, {1, "com.ac", 2, false}, {1, "edu.ac", 2, false}, @@ -1079,6 +1079,12 @@ func init() { {1, "taa.it", 2, false}, {1, "tos.it", 2, false}, {1, "toscana.it", 2, false}, + {1, "trentin-sud-tirol.it", 2, false}, + {1, "xn--trentin-sud-tirol-tsj.it", 2, false}, + {1, "trentin-sudtirol.it", 2, false}, + {1, "xn--trentin-sudtirol-b9i.it", 2, false}, + {1, "trentin-sued-tirol.it", 2, false}, + {1, "trentin-suedtirol.it", 2, false}, {1, "trentino-a-adige.it", 2, false}, {1, "trentino-aadige.it", 2, false}, {1, "trentino-alto-adige.it", 2, false}, @@ -1086,9 +1092,12 @@ func init() { {1, "trentino-s-tirol.it", 2, false}, {1, "trentino-stirol.it", 2, false}, {1, "trentino-sud-tirol.it", 2, false}, + {1, "xn--trentino-sud-tirol-dck.it", 2, false}, {1, "trentino-sudtirol.it", 2, false}, + {1, "xn--trentino-sudtirol-usj.it", 2, false}, {1, "trentino-sued-tirol.it", 2, false}, {1, "trentino-suedtirol.it", 2, false}, + {1, "trentino.it", 2, false}, {1, "trentinoa-adige.it", 2, false}, {1, "trentinoaadige.it", 2, false}, {1, "trentinoalto-adige.it", 2, false}, @@ -1096,9 +1105,17 @@ func init() { {1, "trentinos-tirol.it", 2, false}, {1, "trentinostirol.it", 2, false}, {1, "trentinosud-tirol.it", 2, false}, + {1, "xn--trentinosud-tirol-tsj.it", 2, false}, {1, "trentinosudtirol.it", 2, false}, + {1, "xn--trentinosudtirol-b9i.it", 2, false}, {1, "trentinosued-tirol.it", 2, false}, {1, "trentinosuedtirol.it", 2, false}, + {1, "trentinsud-tirol.it", 2, false}, + {1, "xn--trentinsud-tirol-98i.it", 2, false}, + {1, "trentinsudtirol.it", 2, false}, + {1, "xn--trentinsudtirol-rqi.it", 2, false}, + {1, "trentinsued-tirol.it", 2, false}, + {1, "trentinsuedtirol.it", 2, false}, {1, "tuscany.it", 2, false}, {1, "umb.it", 2, false}, {1, "umbria.it", 2, false}, @@ -1113,7 +1130,13 @@ func init() { {1, "valled-aosta.it", 2, false}, {1, "valledaosta.it", 2, false}, {1, "vallee-aoste.it", 2, false}, + {1, "xn--vallee-aoste-i2g.it", 2, false}, + {1, "vallee-d-aoste.it", 2, false}, + {1, "xn--vallee-d-aoste-43h.it", 2, false}, {1, "valleeaoste.it", 2, false}, + {1, "xn--valleeaoste-6jg.it", 2, false}, + {1, "valleedaoste.it", 2, false}, + {1, "xn--valleedaoste-i2g.it", 2, false}, {1, "vao.it", 2, false}, {1, "vda.it", 2, false}, {1, "ven.it", 2, false}, @@ -1145,6 +1168,9 @@ func init() { {1, "av.it", 2, false}, {1, "avellino.it", 2, false}, {1, "ba.it", 2, false}, + {1, "balsan-sudtirol.it", 2, false}, + {1, "xn--balsan-sudtirol-rqi.it", 2, false}, + {1, "balsan-suedtirol.it", 2, false}, {1, "balsan.it", 2, false}, {1, "bari.it", 2, false}, {1, "barletta-trani-andria.it", 2, false}, @@ -1159,13 +1185,21 @@ func init() { {1, "bn.it", 2, false}, {1, "bo.it", 2, false}, {1, "bologna.it", 2, false}, + {1, "bolzano-altoadige.it", 2, false}, {1, "bolzano.it", 2, false}, + {1, "bozen-sudtirol.it", 2, false}, + {1, "xn--bozen-sudtirol-76h.it", 2, false}, + {1, "bozen-suedtirol.it", 2, false}, {1, "bozen.it", 2, false}, {1, "br.it", 2, false}, {1, "brescia.it", 2, false}, {1, "brindisi.it", 2, false}, {1, "bs.it", 2, false}, {1, "bt.it", 2, false}, + {1, "bulsan-sudtirol.it", 2, false}, + {1, "xn--bulsan-sudtirol-rqi.it", 2, false}, + {1, "bulsan-suedtirol.it", 2, false}, + {1, "bulsan.it", 2, false}, {1, "bz.it", 2, false}, {1, "ca.it", 2, false}, {1, "cagliari.it", 2, false}, @@ -1183,7 +1217,9 @@ func init() { {1, "cb.it", 2, false}, {1, "ce.it", 2, false}, {1, "cesena-forli.it", 2, false}, + {1, "xn--cesena-forli-c2g.it", 2, false}, {1, "cesenaforli.it", 2, false}, + {1, "xn--cesenaforli-0jg.it", 2, false}, {1, "ch.it", 2, false}, {1, "chieti.it", 2, false}, {1, "ci.it", 2, false}, @@ -1214,7 +1250,9 @@ func init() { {1, "fm.it", 2, false}, {1, "foggia.it", 2, false}, {1, "forli-cesena.it", 2, false}, + {1, "xn--forli-cesena-41g.it", 2, false}, {1, "forlicesena.it", 2, false}, + {1, "xn--forlicesena-ujg.it", 2, false}, {1, "fr.it", 2, false}, {1, "frosinone.it", 2, false}, {1, "ge.it", 2, false}, @@ -1345,6 +1383,7 @@ func init() { {1, "sr.it", 2, false}, {1, "ss.it", 2, false}, {1, "suedtirol.it", 2, false}, + {1, "xn--sudtirol-y0e.it", 2, false}, {1, "sv.it", 2, false}, {1, "ta.it", 2, false}, {1, "taranto.it", 2, false}, @@ -1363,7 +1402,6 @@ func init() { {1, "traniandriabarletta.it", 2, false}, {1, "tranibarlettaandria.it", 2, false}, {1, "trapani.it", 2, false}, - {1, "trentino.it", 2, false}, {1, "trento.it", 2, false}, {1, "treviso.it", 2, false}, {1, "trieste.it", 2, false}, @@ -5504,7 +5542,6 @@ func init() { {1, "kep.tr", 2, false}, {1, "nc.tr", 2, false}, {1, "gov.nc.tr", 3, false}, - {1, "travel", 1, false}, {1, "tt", 1, false}, {1, "co.tt", 2, false}, {1, "com.tt", 2, false}, @@ -5964,6 +6001,12 @@ func init() { {1, "xn--node", 1, false}, {1, "xn--qxam", 1, false}, {1, "xn--j6w193g", 1, false}, + {1, "xn--55qx5d.xn--j6w193g", 2, false}, + {1, "xn--wcvs22d.xn--j6w193g", 2, false}, + {1, "xn--mxtq1m.xn--j6w193g", 2, false}, + {1, "xn--gmqw5a.xn--j6w193g", 2, false}, + {1, "xn--od0alg.xn--j6w193g", 2, false}, + {1, "xn--uc0atv.xn--j6w193g", 2, false}, {1, "xn--2scrj9c", 1, false}, {1, "xn--3hcrj9c", 1, false}, {1, "xn--45br5cyl", 1, false}, @@ -7082,6 +7125,7 @@ func init() { {1, "trade", 1, false}, {1, "trading", 1, false}, {1, "training", 1, false}, + {1, "travel", 1, false}, {1, "travelchannel", 1, false}, {1, "travelers", 1, false}, {1, "travelersinsurance", 1, false}, @@ -7386,6 +7430,7 @@ func init() { {1, "backplaneapp.io", 2, true}, {1, "betainabox.com", 2, true}, {1, "bnr.la", 2, true}, + {1, "blackbaudcdn.net", 2, true}, {1, "boomla.net", 2, true}, {1, "boxfuse.io", 2, true}, {1, "square7.ch", 2, true}, @@ -7443,6 +7488,7 @@ func init() { {1, "cloudcontrolled.com", 2, true}, {1, "cloudcontrolapp.com", 2, true}, {1, "co.ca", 2, true}, + {2, "otap.co", 3, true}, {1, "co.cz", 2, true}, {1, "c.cdn77.org", 3, true}, {1, "cdn77-ssl.net", 2, true}, @@ -7461,6 +7507,7 @@ func init() { {1, "cloudns.pw", 2, true}, {1, "cloudns.us", 2, true}, {1, "cloudeity.net", 2, true}, + {1, "cnpy.gdn", 2, true}, {1, "co.nl", 2, true}, {1, "co.no", 2, true}, {1, "webhosting.be", 2, true}, @@ -7481,6 +7528,12 @@ func init() { {1, "cyon.site", 2, true}, {1, "daplie.me", 2, true}, {1, "localhost.daplie.me", 3, true}, + {1, "dattolocal.com", 2, true}, + {1, "dattorelay.com", 2, true}, + {1, "dattoweb.com", 2, true}, + {1, "mydatto.com", 2, true}, + {1, "dattolocal.net", 2, true}, + {1, "mydatto.net", 2, true}, {1, "biz.dk", 2, true}, {1, "co.dk", 2, true}, {1, "firm.dk", 2, true}, @@ -7787,6 +7840,7 @@ func init() { {1, "ddnss.org", 2, true}, {1, "definima.net", 2, true}, {1, "definima.io", 2, true}, + {1, "bci.dnstrace.pro", 3, true}, {1, "ddnsfree.com", 2, true}, {1, "ddnsgeek.com", 2, true}, {1, "giize.com", 2, true}, @@ -7961,6 +8015,8 @@ func init() { {1, "a.ssl.fastly.net", 4, true}, {1, "b.ssl.fastly.net", 4, true}, {1, "global.ssl.fastly.net", 4, true}, + {1, "fastpanel.direct", 2, true}, + {1, "fastvps-server.com", 2, true}, {1, "fhapp.xyz", 2, true}, {1, "fedorainfracloud.org", 2, true}, {1, "fedorapeople.org", 2, true}, @@ -7977,7 +8033,10 @@ func init() { {1, "fbxos.fr", 2, true}, {1, "freebox-os.fr", 2, true}, {1, "freeboxos.fr", 2, true}, + {1, "freedesktop.org", 2, true}, {2, "futurecms.at", 3, true}, + {2, "ex.futurecms.at", 4, true}, + {2, "in.futurecms.at", 4, true}, {1, "futurehosting.at", 2, true}, {1, "futuremailing.at", 2, true}, {2, "ex.ortsinfo.at", 4, true}, @@ -8081,6 +8140,11 @@ func init() { {1, "hepforge.org", 2, true}, {1, "herokuapp.com", 2, true}, {1, "herokussl.com", 2, true}, + {1, "myravendb.com", 2, true}, + {1, "ravendb.community", 2, true}, + {1, "ravendb.me", 2, true}, + {1, "development.run", 2, true}, + {1, "ravendb.run", 2, true}, {1, "moonscale.net", 2, true}, {1, "iki.fi", 2, true}, {1, "biz.at", 2, true}, @@ -8115,6 +8179,8 @@ func init() { {1, "to.leg.br", 3, true}, {1, "pixolino.com", 2, true}, {1, "ipifony.net", 2, true}, + {1, "mein-iserv.de", 2, true}, + {1, "test-iserv.de", 2, true}, {1, "myjino.ru", 2, true}, {2, "hosting.myjino.ru", 4, true}, {2, "landing.myjino.ru", 4, true}, @@ -8130,19 +8196,44 @@ func init() { {1, "git-repos.de", 2, true}, {1, "lcube-server.de", 2, true}, {1, "svn-repos.de", 2, true}, + {1, "app.lmpm.com", 3, true}, + {1, "linkitools.space", 2, true}, {1, "linkyard.cloud", 2, true}, {1, "linkyard-cloud.ch", 2, true}, {1, "we.bs", 2, true}, + {1, "uklugs.org", 2, true}, + {1, "glug.org.uk", 3, true}, + {1, "lug.org.uk", 3, true}, + {1, "lugs.org.uk", 3, true}, {1, "barsy.bg", 2, true}, + {1, "barsy.co.uk", 3, true}, + {1, "barsyonline.co.uk", 3, true}, + {1, "barsycenter.com", 2, true}, {1, "barsyonline.com", 2, true}, + {1, "barsy.club", 2, true}, {1, "barsy.de", 2, true}, {1, "barsy.eu", 2, true}, {1, "barsy.in", 2, true}, + {1, "barsy.info", 2, true}, + {1, "barsy.io", 2, true}, + {1, "barsy.me", 2, true}, + {1, "barsy.menu", 2, true}, + {1, "barsy.mobi", 2, true}, {1, "barsy.net", 2, true}, {1, "barsy.online", 2, true}, + {1, "barsy.org", 2, true}, + {1, "barsy.pro", 2, true}, + {1, "barsy.pub", 2, true}, + {1, "barsy.shop", 2, true}, + {1, "barsy.site", 2, true}, {1, "barsy.support", 2, true}, + {1, "barsy.uk", 2, true}, {2, "magentosite.cloud", 3, true}, + {1, "mayfirst.info", 2, true}, + {1, "mayfirst.org", 2, true}, {1, "hb.cldmail.ru", 3, true}, + {1, "miniserver.com", 2, true}, + {1, "memset.net", 2, true}, {1, "cloud.metacentrum.cz", 3, true}, {1, "custom.metacentrum.cz", 3, true}, {1, "flt.cloud.muni.cz", 4, true}, @@ -8165,6 +8256,31 @@ func init() { {1, "ngrok.io", 2, true}, {1, "nh-serv.co.uk", 3, true}, {1, "nfshost.com", 2, true}, + {1, "dnsking.ch", 2, true}, + {1, "mypi.co", 2, true}, + {1, "n4t.co", 2, true}, + {1, "001www.com", 2, true}, + {1, "ddnslive.com", 2, true}, + {1, "myiphost.com", 2, true}, + {1, "forumz.info", 2, true}, + {1, "16-b.it", 2, true}, + {1, "32-b.it", 2, true}, + {1, "64-b.it", 2, true}, + {1, "soundcast.me", 2, true}, + {1, "tcp4.me", 2, true}, + {1, "dnsup.net", 2, true}, + {1, "hicam.net", 2, true}, + {1, "now-dns.net", 2, true}, + {1, "ownip.net", 2, true}, + {1, "vpndns.net", 2, true}, + {1, "dynserv.org", 2, true}, + {1, "now-dns.org", 2, true}, + {1, "x443.pw", 2, true}, + {1, "now-dns.top", 2, true}, + {1, "ntdll.top", 2, true}, + {1, "freeddns.us", 2, true}, + {1, "crafting.xyz", 2, true}, + {1, "zapto.xyz", 2, true}, {1, "nsupdate.info", 2, true}, {1, "nerdpol.ovh", 2, true}, {1, "blogsyte.com", 2, true}, @@ -8255,27 +8371,35 @@ func init() { {1, "stage.nodeart.io", 3, true}, {1, "nodum.co", 2, true}, {1, "nodum.io", 2, true}, + {1, "pcloud.host", 2, true}, {1, "nyc.mn", 2, true}, {1, "nom.ae", 2, true}, + {1, "nom.af", 2, true}, {1, "nom.ai", 2, true}, {1, "nom.al", 2, true}, {1, "nym.by", 2, true}, {1, "nym.bz", 2, true}, {1, "nom.cl", 2, true}, {1, "nom.gd", 2, true}, + {1, "nom.ge", 2, true}, {1, "nom.gl", 2, true}, {1, "nym.gr", 2, true}, {1, "nom.gt", 2, true}, + {1, "nym.gy", 2, true}, {1, "nom.hn", 2, true}, + {1, "nym.ie", 2, true}, {1, "nom.im", 2, true}, + {1, "nom.ke", 2, true}, {1, "nym.kz", 2, true}, {1, "nym.la", 2, true}, + {1, "nym.lc", 2, true}, {1, "nom.li", 2, true}, {1, "nym.li", 2, true}, {1, "nym.lt", 2, true}, {1, "nym.lu", 2, true}, {1, "nym.me", 2, true}, {1, "nom.mk", 2, true}, + {1, "nym.mn", 2, true}, {1, "nym.mx", 2, true}, {1, "nom.nu", 2, true}, {1, "nym.nz", 2, true}, @@ -8283,22 +8407,27 @@ func init() { {1, "nym.pt", 2, true}, {1, "nom.pw", 2, true}, {1, "nom.qa", 2, true}, + {1, "nym.ro", 2, true}, {1, "nom.rs", 2, true}, {1, "nom.si", 2, true}, {1, "nym.sk", 2, true}, + {1, "nom.st", 2, true}, {1, "nym.su", 2, true}, {1, "nym.sx", 2, true}, + {1, "nom.tj", 2, true}, {1, "nym.tw", 2, true}, {1, "nom.ug", 2, true}, {1, "nom.uy", 2, true}, {1, "nom.vc", 2, true}, {1, "nom.vg", 2, true}, {1, "cya.gg", 2, true}, + {1, "cloudycluster.net", 2, true}, {1, "nid.io", 2, true}, {1, "opencraft.hosting", 2, true}, {1, "operaunite.com", 2, true}, {1, "outsystemscloud.com", 2, true}, {1, "ownprovider.com", 2, true}, + {1, "own.pm", 2, true}, {1, "ox.rs", 2, true}, {1, "oy.lc", 2, true}, {1, "pgfog.com", 2, true}, @@ -8373,8 +8502,10 @@ func init() { {1, "apps.lair.io", 3, true}, {2, "stolos.io", 3, true}, {1, "spacekit.io", 2, true}, + {1, "customer.speedpartner.de", 3, true}, {1, "stackspace.space", 2, true}, {1, "storj.farm", 2, true}, + {1, "utwente.io", 2, true}, {1, "temp-dns.com", 2, true}, {1, "diskstation.me", 2, true}, {1, "dscloud.biz", 2, true}, @@ -8440,10 +8571,13 @@ func init() { {1, "synology-diskstation.de", 2, true}, {1, "synology-ds.de", 2, true}, {1, "uber.space", 2, true}, + {2, "uberspace.de", 3, true}, {1, "hk.com", 2, true}, {1, "hk.org", 2, true}, {1, "ltd.hk", 2, true}, {1, "inc.hk", 2, true}, + {1, "virtualuser.de", 2, true}, + {1, "virtual-user.de", 2, true}, {1, "lib.de.us", 3, true}, {1, "2038.io", 2, true}, {1, "router.management", 2, true}, @@ -8453,6 +8587,10 @@ func init() { {1, "wedeploy.sh", 2, true}, {1, "remotewd.com", 2, true}, {1, "wmflabs.org", 2, true}, + {1, "half.host", 2, true}, + {1, "xnbay.com", 2, true}, + {1, "u2.xnbay.com", 3, true}, + {1, "u2-local.xnbay.com", 3, true}, {1, "cistron.nl", 2, true}, {1, "demon.nl", 2, true}, {1, "xs4all.space", 2, true}, @@ -8470,6 +8608,7 @@ func init() { {1, "za.net", 2, true}, {1, "za.org", 2, true}, {1, "now.sh", 2, true}, + {1, "zone.id", 2, true}, } DefaultList.rules = r[:] }