publicsuffix: update table to latest list from publicsuffix.org.

Also drop some leading zeroes in in the generated table.go file. Its
size drops from 140K to 124K. After gzipping, this is from 46K to 45K.
It's not a huge win, but it's a win.

Change-Id: Ib1c13fb8b58b4eca231b5d74c15297f245c62e7c
Reviewed-on: https://go-review.googlesource.com/24753
Reviewed-by: Andrew Gerrand <adg@golang.org>

publicsuffix/gen.go

@@ -420,7 +420,7 @@ var children=[...]uint32{
 			fmt.Fprintf(w, "0x%08x, // c0x%04x (%s)%s %s\n",
 				c, i, s, wildcardStr(wildcard), nodeTypeStr(nodeType))
 		} else {
-			fmt.Fprintf(w, "0x%08x,\n", c)
+			fmt.Fprintf(w, "0x%x,\n", c)
 		}
 	}
 	fmt.Fprintf(w, "}\n\n")
@@ -560,7 +560,7 @@ func printNode(w io.Writer, n *node) error {
 				nodeTypeStr(c.nodeType), icannStr(c.icann), c.label,
 			)
 		} else {
-			fmt.Fprintf(w, "0x%08x,\n", encoding)
+			fmt.Fprintf(w, "0x%x,\n", encoding)
 		}
 	}
 	return nil

publicsuffix/table_test.go

@@ -215,16 +215,12 @@ var rules = [...]string{
 	"pro.az",
 	"biz.az",
 	"ba",
-	"org.ba",
-	"net.ba",
+	"com.ba",
 	"edu.ba",
 	"gov.ba",
 	"mil.ba",
-	"unsa.ba",
-	"unbi.ba",
-	"co.ba",
-	"com.ba",
-	"rs.ba",
+	"net.ba",
+	"org.ba",
 	"bb",
 	"biz.bb",
 	"co.bb",
@@ -2215,7 +2211,6 @@ var rules = [...]string{
 	"kamiamakusa.kumamoto.jp",
 	"kashima.kumamoto.jp",
 	"kikuchi.kumamoto.jp",
-	"kosa.kumamoto.jp",
 	"kumamoto.kumamoto.jp",
 	"mashiki.kumamoto.jp",
 	"mifune.kumamoto.jp",
@@ -7286,26 +7281,27 @@ var rules = [...]string{
 	"zippo",
 	"zone",
 	"zuerich",
+	"beep.pl",
 	"*.compute.estate",
 	"*.alces.network",
 	"cloudfront.net",
+	"compute.amazonaws.com",
 	"ap-northeast-1.compute.amazonaws.com",
 	"ap-northeast-2.compute.amazonaws.com",
 	"ap-southeast-1.compute.amazonaws.com",
 	"ap-southeast-2.compute.amazonaws.com",
-	"cn-north-1.compute.amazonaws.cn",
-	"compute-1.amazonaws.com",
-	"compute.amazonaws.cn",
-	"compute.amazonaws.com",
 	"eu-central-1.compute.amazonaws.com",
 	"eu-west-1.compute.amazonaws.com",
 	"sa-east-1.compute.amazonaws.com",
-	"us-east-1.amazonaws.com",
 	"us-gov-west-1.compute.amazonaws.com",
 	"us-west-1.compute.amazonaws.com",
 	"us-west-2.compute.amazonaws.com",
+	"us-east-1.amazonaws.com",
+	"compute-1.amazonaws.com",
 	"z-1.compute-1.amazonaws.com",
 	"z-2.compute-1.amazonaws.com",
+	"compute.amazonaws.com.cn",
+	"cn-north-1.compute.amazonaws.com.cn",
 	"elasticbeanstalk.com",
 	"elb.amazonaws.com",
 	"s3.amazonaws.com",
@@ -7326,8 +7322,14 @@ var rules = [...]string{
 	"s3.cn-north-1.amazonaws.com.cn",
 	"s3.eu-central-1.amazonaws.com",
 	"on-aptible.com",
+	"potager.org",
+	"poivron.org",
+	"sweetpepper.org",
+	"pimienta.org",
 	"myfritz.net",
 	"betainabox.com",
+	"boxfuse.io",
+	"mycd.eu",
 	"ae.org",
 	"ar.com",
 	"br.com",
@@ -7362,7 +7364,9 @@ var rules = [...]string{
 	"us.org",
 	"co.com",
 	"c.la",
+	"certmgr.org",
 	"xenapponazure.com",
+	"virtueeldomein.nl",
 	"cloudcontrolled.com",
 	"cloudcontrolapp.com",
 	"co.ca",
@@ -7375,6 +7379,8 @@ var rules = [...]string{
 	"co.nl",
 	"co.no",
 	"*.platform.sh",
+	"realm.cz",
+	"*.cryptonomic.net",
 	"cupcake.is",
 	"cyon.link",
 	"cyon.site",
@@ -7728,12 +7734,17 @@ var rules = [...]string{
 	"tr.eu.org",
 	"uk.eu.org",
 	"us.eu.org",
+	"eu-1.evennode.com",
+	"eu-2.evennode.com",
+	"us-1.evennode.com",
+	"us-2.evennode.com",
 	"apps.fbsbx.com",
 	"a.ssl.fastly.net",
 	"b.ssl.fastly.net",
 	"global.ssl.fastly.net",
 	"a.prod.fastly.net",
 	"global.prod.fastly.net",
+	"fhapp.xyz",
 	"firebaseapp.com",
 	"flynnhub.com",
 	"freebox-os.com",
@@ -7836,11 +7847,16 @@ var rules = [...]string{
 	"withgoogle.com",
 	"withyoutube.com",
 	"hashbang.sh",
+	"hasura-app.io",
+	"hepforge.org",
 	"herokuapp.com",
 	"herokussl.com",
 	"iki.fi",
 	"biz.at",
 	"info.at",
+	"*.magentosite.cloud",
+	"meteorapp.com",
+	"eu.meteorapp.com",
 	"co.pl",
 	"azurewebsites.net",
 	"azure-mobile.net",
@@ -7962,9 +7978,12 @@ var rules = [...]string{
 	"rhcloud.com",
 	"hzc.io",
 	"sandcats.io",
+	"logoip.de",
+	"logoip.com",
 	"biz.ua",
 	"co.ua",
 	"pp.ua",
+	"myshopblocks.com",
 	"sinaapp.com",
 	"vipsinaapp.com",
 	"1kapp.com",
@@ -7992,6 +8011,7 @@ var rules = [...]string{
 	"sopot.pl",
 	"bloxcms.com",
 	"townnews-staging.com",
+	"tuxfamily.org",
 	"hk.com",
 	"hk.org",
 	"ltd.hk",
@@ -9756,16 +9776,12 @@ var nodeLabels = [...]string{
 	"pp",
 	"pro",
 	"blogspot",
-	"co",
 	"com",
 	"edu",
 	"gov",
 	"mil",
 	"net",
 	"org",
-	"rs",
-	"unbi",
-	"unsa",
 	"biz",
 	"co",
 	"com",
@@ -9997,13 +10013,13 @@ var nodeLabels = [...]string{
 	"gob",
 	"gov",
 	"mil",
+	"magentosite",
 	"co",
 	"com",
 	"gov",
 	"net",
 	"ac",
 	"ah",
-	"amazonaws",
 	"bj",
 	"com",
 	"cq",
@@ -10046,11 +10062,11 @@ var nodeLabels = [...]string{
 	"xz",
 	"yn",
 	"zj",
-	"compute",
-	"cn-north-1",
 	"amazonaws",
 	"cn-north-1",
+	"compute",
 	"s3",
+	"cn-north-1",
 	"arts",
 	"com",
 	"edu",
@@ -10122,6 +10138,7 @@ var nodeLabels = [...]string{
 	"est-le-patron",
 	"est-mon-blogueur",
 	"eu",
+	"evennode",
 	"familyds",
 	"fbsbx",
 	"firebaseapp",
@@ -10259,10 +10276,13 @@ var nodeLabels = [...]string{
 	"kr",
 	"likes-pie",
 	"likescandy",
+	"logoip",
+	"meteorapp",
 	"mex",
 	"myactivedirectory",
 	"mydrobo",
 	"mysecuritycamera",
+	"myshopblocks",
 	"myvnc",
 	"neat-url",
 	"net-freaks",
@@ -10361,10 +10381,15 @@ var nodeLabels = [...]string{
 	"s3",
 	"alpha",
 	"beta",
+	"eu-1",
+	"eu-2",
+	"us-1",
+	"us-2",
 	"apps",
 	"api",
 	"ext",
 	"gist",
+	"eu",
 	"xen",
 	"ac",
 	"co",
@@ -10403,6 +10428,7 @@ var nodeLabels = [...]string{
 	"blogspot",
 	"co",
 	"e4",
+	"realm",
 	"blogspot",
 	"com",
 	"dnshome",
@@ -10412,6 +10438,7 @@ var nodeLabels = [...]string{
 	"istmein",
 	"lebtimnetz",
 	"leitungsen",
+	"logoip",
 	"traeumtgerade",
 	"biz",
 	"blogspot",
@@ -10490,6 +10517,7 @@ var nodeLabels = [...]string{
 	"name",
 	"net",
 	"org",
+	"mycd",
 	"aland",
 	"blogspot",
 	"dy",
@@ -10724,9 +10752,11 @@ var nodeLabels = [...]string{
 	"selfip",
 	"webhop",
 	"eu",
+	"boxfuse",
 	"com",
 	"dedyn",
 	"github",
+	"hasura-app",
 	"hzc",
 	"ngrok",
 	"nid",
@@ -12057,7 +12087,6 @@ var nodeLabels = [...]string{
 	"kamiamakusa",
 	"kashima",
 	"kikuchi",
-	"kosa",
 	"kumamoto",
 	"mashiki",
 	"mifune",
@@ -13786,6 +13815,7 @@ var nodeLabels = [...]string{
 	"cloudapp",
 	"cloudfront",
 	"cloudfunctions",
+	"cryptonomic",
 	"ddns",
 	"dnsalias",
 	"dnsdojo",
@@ -13892,6 +13922,7 @@ var nodeLabels = [...]string{
 	"blogspot",
 	"bv",
 	"co",
+	"virtueeldomein",
 	"aa",
 	"aarborte",
 	"aejrie",
@@ -14702,6 +14733,7 @@ var nodeLabels = [...]string{
 	"cable-modem",
 	"cdn77",
 	"cdn77-secure",
+	"certmgr",
 	"collegefan",
 	"couchpotatofries",
 	"dnsalias",
@@ -14721,6 +14753,7 @@ var nodeLabels = [...]string{
 	"from-me",
 	"game-host",
 	"gotdns",
+	"hepforge",
 	"hk",
 	"hobby-site",
 	"homedns",
@@ -14753,7 +14786,10 @@ var nodeLabels = [...]string{
 	"mysecuritycamera",
 	"nflfan",
 	"no-ip",
+	"pimienta",
 	"podzone",
+	"poivron",
+	"potager",
 	"read-books",
 	"readmyblog",
 	"selfip",
@@ -14762,7 +14798,9 @@ var nodeLabels = [...]string{
 	"serveftp",
 	"servegame",
 	"stuff-4-sale",
+	"sweetpepper",
 	"tunk",
+	"tuxfamily",
 	"ufcfan",
 	"us",
 	"webhop",
@@ -14882,6 +14920,7 @@ var nodeLabels = [...]string{
 	"auto",
 	"babia-gora",
 	"bedzin",
+	"beep",
 	"beskidy",
 	"bialowieza",
 	"bialystok",
@@ -16003,6 +16042,7 @@ var nodeLabels = [...]string{
 	"xn--d1at",
 	"xn--o1ac",
 	"xn--o1ach",
+	"fhapp",
 	"ac",
 	"agric",
 	"alt",