domain_name 0.5.20160615 → 0.5.20161021

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9fda9091db741b17ff6fbac8539aaf506ce271d
-  data.tar.gz: c33ab2798a9129ed531702030600e39b13f96946
+  metadata.gz: 578e983a7d2bfce1e2ba8d1239fb1c5a3b048ab7
+  data.tar.gz: 053c2ed1c2dba0effe83e184b10df96d6c8e9bae
 SHA512:
-  metadata.gz: b92bc01bf7044304d6b8035be2b89ec8274383b7a784933cf1979e9d158d71095bda81a6e613bae995c82e0a751059a47c9052536e5cc6578d8dc53b8b7cdce9
-  data.tar.gz: 0c989b526714c1402acc7cfa907df5a41d31390f96b5ae7b2e14e44e6f7869d1d71b4ab4981538152181e1dd030c034d99aba88e712fb5c7c19586fee65e42f7
+  metadata.gz: 0bfc806530e7ef41274f0c447f7ba87cdf03ffb73c8a8c9290ea9a41d57a9f21496cd8e19796dadfb80da5890b7ffb422eea75d11c1dd623aec6fd282a98b5f2
+  data.tar.gz: 46f9e29879d77c57a91835e3529c66b1ee7ac43c9dff235f57450f3f41c726b6e7c78a71d829eb3270aa96518530a4f0c1e84512c65d6d97b3df8b7ce89792fd

data/.travis.yml

@@ -4,9 +4,12 @@ rvm:
   - ree
   - 1.9.3
   - 2.0.0
-  - 2.1.1
+  - 2.1.9
+  - 2.2.5
+  - 2.3.1
   - ruby-head
-  - jruby-19mode
+  - jruby-1.7.20
+  - jruby-9.0.5.0
   - jruby-head
   - rbx-2
 matrix:
@@ -14,3 +17,5 @@ matrix:
     - rvm: ruby-head
     - rvm: jruby-head
     - rvm: rbx-2
+before_install:
+  - gem update bundler

data/CHANGELOG.md

@@ -0,0 +1,189 @@
+# Change Log
+
+## [v0.5.20160826](https://github.com/knu/ruby-domain_name/tree/v0.5.20160826) (2016-09-01)
+[Full Changelog](https://github.com/knu/ruby-domain_name/compare/v0.5.20160615...v0.5.20160826)
+
+- Update the license for the eTLD database
+- Update the eTLD database to 2016-08-26T16:52:03Z
+
+## [v0.5.20160615](https://github.com/knu/ruby-domain_name/tree/v0.5.20160615) (2016-06-16)
+[Full Changelog](https://github.com/knu/ruby-domain_name/compare/v0.5.20160310...v0.5.20160615)
+
+- Always set `@domain` to avoid a warning when `$VERBOSE` is on
+- Update the eTLD database to 2016-06-15T16:22:11Z
+
+## [v0.5.20160310](https://github.com/knu/ruby-domain_name/tree/v0.5.20160310) (2016-03-17)
+[Full Changelog](https://github.com/knu/ruby-domain_name/compare/v0.5.20160309...v0.5.20160310)
+
+- Update development dependencies for obsolete rubies
+- Update the eTLD database to 2016-03-10T21:22:02Z
+
+## [v0.5.20160309](https://github.com/knu/ruby-domain_name/tree/v0.5.20160309) (2016-03-09)
+[Full Changelog](https://github.com/knu/ruby-domain_name/compare/v0.5.20160216...v0.5.20160309)
+
+- Fix support for Ruby 1.8
+- Update the eTLD database to 2016-03-09T09:52:02Z
+
+## [v0.5.20160216](https://github.com/knu/ruby-domain_name/tree/v0.5.20160216) (2016-02-24)
+[Full Changelog](https://github.com/knu/ruby-domain_name/compare/v0.5.20160128...v0.5.20160216)
+
+- Update the eTLD database to 2016-02-16T19:22:02Z
+
+## [v0.5.20160128](https://github.com/knu/ruby-domain_name/tree/v0.5.20160128) (2016-01-29)
+[Full Changelog](https://github.com/knu/ruby-domain_name/compare/v0.5.25...v0.5.20160128)
+
+- Use the date as part of VERSION
+- Update the eTLD database to 2016-01-28T23:22:02Z
+
+## [v0.5.25](https://github.com/knu/ruby-domain_name/tree/v0.5.25) (2015-10-06)
+[Full Changelog](https://github.com/knu/ruby-domain_name/compare/v0.5.24...v0.5.25)
+
+- Restrict i18n < 0.7.0 on ruby 1.8.
+- Update the eTLD database to 2015-09-29T17:22:03Z
+
+## [v0.5.24](https://github.com/knu/ruby-domain_name/tree/v0.5.24) (2015-04-16)
+[Full Changelog](https://github.com/knu/ruby-domain_name/compare/v0.5.23...v0.5.24)
+
+- Update the eTLD database to 2015-04-07T20:26:05Z
+
+## [v0.5.23](https://github.com/knu/ruby-domain_name/tree/v0.5.23) (2014-12-19)
+[Full Changelog](https://github.com/knu/ruby-domain_name/compare/v0.5.22...v0.5.23)
+
+- Update the eTLD database to 2014-12-18T02:26:03Z
+
+## [v0.5.22](https://github.com/knu/ruby-domain_name/tree/v0.5.22) (2014-10-28)
+[Full Changelog](https://github.com/knu/ruby-domain_name/compare/v0.5.21...v0.5.22)
+
+- Update the eTLD database to 2014-10-27T15:26:07Z
+
+## [v0.5.21](https://github.com/knu/ruby-domain_name/tree/v0.5.21) (2014-09-09)
+[Full Changelog](https://github.com/knu/ruby-domain_name/compare/v0.5.20...v0.5.21)
+
+- Update the eTLD database to 2014-09-05T01:56:10Z
+
+## [v0.5.20](https://github.com/knu/ruby-domain_name/tree/v0.5.20) (2014-08-18)
+[Full Changelog](https://github.com/knu/ruby-domain_name/compare/v0.5.19...v0.5.20)
+
+- Update the eTLD database to 2014-08-14T00:56:09Z
+
+## [v0.5.19](https://github.com/knu/ruby-domain_name/tree/v0.5.19) (2014-06-12)
+[Full Changelog](https://github.com/knu/ruby-domain_name/compare/v0.5.18...v0.5.19)
+
+- Update the eTLD database to 2014-06-11T15:26:13Z
+
+## [v0.5.18](https://github.com/knu/ruby-domain_name/tree/v0.5.18) (2014-03-27)
+[Full Changelog](https://github.com/knu/ruby-domain_name/compare/v0.5.17...v0.5.18)
+
+- Update the eTLD database to 2014-03-27T03:00:59Z
+
+## [v0.5.17](https://github.com/knu/ruby-domain_name/tree/v0.5.17) (2014-03-21)
+[Full Changelog](https://github.com/knu/ruby-domain_name/compare/v0.5.16...v0.5.17)
+
+- Update the eTLD database to 2014-03-20T15:01:09Z
+
+## [v0.5.16](https://github.com/knu/ruby-domain_name/tree/v0.5.16) (2014-02-12)
+[Full Changelog](https://github.com/knu/ruby-domain_name/compare/v0.5.15...v0.5.16)
+
+- Update the eTLD database to 2014-02-11T16:01:07Z
+
+## [v0.5.15](https://github.com/knu/ruby-domain_name/tree/v0.5.15) (2013-11-15)
+[Full Changelog](https://github.com/knu/ruby-domain_name/compare/v0.5.14...v0.5.15)
+
+- Update the eTLD database to 2013-11-15T16:01:28Z
+- Merge IDN tests from mozilla-central/netwerk/test/unit/data/test_psl.txt
+
+## [v0.5.14](https://github.com/knu/ruby-domain_name/tree/v0.5.14) (2013-10-16)
+[Full Changelog](https://github.com/knu/ruby-domain_name/compare/v0.5.13...v0.5.14)
+
+- Update the eTLD database to 2013-10-16T07:01:24Z
+
+## [v0.5.13](https://github.com/knu/ruby-domain_name/tree/v0.5.13) (2013-08-18)
+[Full Changelog](https://github.com/knu/ruby-domain_name/compare/v0.5.12...v0.5.13)
+
+- Update the eTLD database to 2013-08-15T11:01:26Z
+- Adjust dependencies for Ruby 1.8
+
+## [v0.5.12](https://github.com/knu/ruby-domain_name/tree/v0.5.12) (2013-06-07)
+[Full Changelog](https://github.com/knu/ruby-domain_name/compare/v0.5.11...v0.5.12)
+
+- Update the eTLD database to 2013-06-06T23:00:56Z
+- Add *_idn methods that do ToUnicode conversion
+
+## [v0.5.11](https://github.com/knu/ruby-domain_name/tree/v0.5.11) (2013-04-12)
+[Full Changelog](https://github.com/knu/ruby-domain_name/compare/v0.5.10...v0.5.11)
+
+- Add DomainName#superdomain
+- Update the database to 2013-04-05T23:00:49Z
+
+## [v0.5.10](https://github.com/knu/ruby-domain_name/tree/v0.5.10) (2013-04-01)
+[Full Changelog](https://github.com/knu/ruby-domain_name/compare/v0.5.9...v0.5.10)
+
+- Update the eTLD database to that of 2013-03-31T03:02:39Z
+
+## [v0.5.9](https://github.com/knu/ruby-domain_name/tree/v0.5.9) (2013-03-17)
+[Full Changelog](https://github.com/knu/ruby-domain_name/compare/v0.5.8...v0.5.9)
+
+- Support unf 0.1.0
+
+## [v0.5.8](https://github.com/knu/ruby-domain_name/tree/v0.5.8) (2013-03-14)
+[Full Changelog](https://github.com/knu/ruby-domain_name/compare/v0.5.7...v0.5.8)
+
+- Update the eTLD database to the version as of 2013-02-18T20:02:07Z
+
+## [v0.5.7](https://github.com/knu/ruby-domain_name/tree/v0.5.7) (2013-01-07)
+[Full Changelog](https://github.com/knu/ruby-domain_name/compare/v0.5.6...v0.5.7)
+
+- Update the eTLD list
+
+## [v0.5.6](https://github.com/knu/ruby-domain_name/tree/v0.5.6) (2012-12-06)
+[Full Changelog](https://github.com/knu/ruby-domain_name/compare/v0.5.5...v0.5.6)
+
+- Update the eTLD list
+
+## [v0.5.5](https://github.com/knu/ruby-domain_name/tree/v0.5.5) (2012-12-06)
+[Full Changelog](https://github.com/knu/ruby-domain_name/compare/v0.5.4...v0.5.5)
+
+- Add an optional host_only flag to DomainName#cookie_domain?
+- Migrate from jeweler to bundle gem
+
+## [v0.5.4](https://github.com/knu/ruby-domain_name/tree/v0.5.4) (2012-09-18)
+[Full Changelog](https://github.com/knu/ruby-domain_name/compare/v0.5.3...v0.5.4)
+
+- Update the eTLD list
+- Import updated test cases suggested by Mozilla developers
+
+## [v0.5.3](https://github.com/knu/ruby-domain_name/tree/v0.5.3) (2012-04-06)
+[Full Changelog](https://github.com/knu/ruby-domain_name/compare/v0.5.2...v0.5.3)
+
+- Implement Punycode decoder
+
+**Closed issues:**
+
+-  Running DomainName multi-threaded leads to Stack Errors [\#2](https://github.com/knu/ruby-domain_name/issues/2)
+
+## [v0.5.2](https://github.com/knu/ruby-domain_name/tree/v0.5.2) (2012-01-18)
+[Full Changelog](https://github.com/knu/ruby-domain_name/compare/v0.5.1...v0.5.2)
+
+- Update the eTLD list
+
+## [v0.5.1](https://github.com/knu/ruby-domain_name/tree/v0.5.1) (2011-11-09)
+[Full Changelog](https://github.com/knu/ruby-domain_name/compare/v0.5.0...v0.5.1)
+
+- DomainName.new calls #to_str if a non-string object is given
+- Fix support for IPv6 addresses enclosed in square brackets
+
+**Merged pull requests:**
+
+- Fixed DomainName\#\<=\> for use with Ruby 1.8.7 [\#1](https://github.com/knu/ruby-domain_name/pull/1) ([drbrain](https://github.com/drbrain))
+
+## [v0.5.0](https://github.com/knu/ruby-domain_name/tree/v0.5.0) (2011-11-04)
+[Full Changelog](https://github.com/knu/ruby-domain_name/compare/v0.0.0...v0.5.0)
+
+- Implement DomainName comparison and fix cookie_domain?()
+- Avoid warnings about uninitialized instance variables
+
+## [v0.0.0](https://github.com/knu/ruby-domain_name/tree/v0.0.0) (2011-10-29)
+
+- Initial release
+
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2011, 2012, 2013 Akinori MUSHA
+Copyright (c) 2011-2016 Akinori MUSHA
 
 All rights reserved.
 
@@ -25,6 +25,11 @@ SUCH DAMAGE.
 
 * lib/domain_name/punycode.rb
 
+This file is derived from the implementation of punycode available at
+here:
+
+https://www.verisign.com/en_US/channel-resources/domain-registry-products/idn-sdks/index.xhtml
+
 Copyright (C) 2000-2002 Verisign Inc., All rights reserved.
 
 Redistribution and use in source and binary forms, with or
@@ -67,41 +72,7 @@ Authors:
 
 * lib/domain_name/etld_data.rb
 
-Version: MPL 1.1/GPL 2.0/LGPL 2.1
-
-The contents of this file are subject to the Mozilla Public License Version 
-1.1 (the "License"); you may not use this file except in compliance with 
-the License. You may obtain a copy of the License at 
-http://www.mozilla.org/MPL/
-
-Software distributed under the License is distributed on an "AS IS" basis,
-WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-for the specific language governing rights and limitations under the
-License.
-
-The Original Code is the Public Suffix List.
-
-The Initial Developer of the Original Code is
-Jo Hermans <jo.hermans@gmail.com>.
-Portions created by the Initial Developer are Copyright (C) 2007
-the Initial Developer. All Rights Reserved.
-
-Contributor(s):
-  Ruben Arakelyan <ruben@rubenarakelyan.com>
-  Gervase Markham <gerv@gerv.net>
-  Pamela Greene <pamg.bugs@gmail.com>
-  David Triendl <david@triendl.name>
-  Jothan Frakes <jothan@gmail.com>
-  The kind representatives of many TLD registries
-
-Alternatively, the contents of this file may be used under the terms of
-either the GNU General Public License Version 2 or later (the "GPL"), or
-the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-in which case the provisions of the GPL or the LGPL are applicable instead
-of those above. If you wish to allow use of your version of this file only
-under the terms of either the GPL or the LGPL, and not to allow others to
-use your version of this file under the terms of the MPL, indicate your
-decision by deleting the provisions above and replace them with the notice
-and other provisions required by the GPL or the LGPL. If you do not delete
-the provisions above, a recipient may use your version of this file under
-the terms of any one of the MPL, the GPL or the LGPL.
+This file is generated from the Public Suffix List
+(https://publicsuffix.org/), which is licensed under MPL 2.0:
+
+https://mozilla.org/MPL/2.0/

data/README.md

@@ -53,17 +53,15 @@ References
 
 * [RFC 5893](http://tools.ietf.org/html/rfc5892)
 
-* [Public Suffix List](http://publicsuffix.org/list/)
-
-* [Effective TLD Names List](http://mxr.mozilla.org/mozilla-central/source/netwerk/dns/effective_tld_names.dat?raw=1)
+* [Public Suffix List](https://publicsuffix.org/list/)
 
 License
 -------
 
-Copyright (c) 2011, 2012, 2013 Akinori MUSHA
+Copyright (c) 2011-2016 Akinori MUSHA
 
 Licensed under the 2-clause BSD license.
 
 Some portion of this library is copyrighted by third parties and
-licensed under MPL 1.1/GPL 2.0/LGPL 2.1 or 3-clause BSD license,
+licensed under MPL 2.0 or 3-clause BSD license,
 See `LICENSE.txt` for details.

data/Rakefile

@@ -1,8 +1,7 @@
 require 'bundler/gem_tasks'
 require 'uri'
-
-ETLD_DATA_URI  = URI('https://publicsuffix.org/list/effective_tld_names.dat')
-ETLD_DATA_FILE = 'data/effective_tld_names.dat'
+ETLD_DATA_URI  = URI('https://publicsuffix.org/list/public_suffix_list.dat')
+ETLD_DATA_FILE = 'data/public_suffix_list.dat'
 ETLD_DATA_RB   = 'lib/domain_name/etld_data.rb'
 VERSION_RB     = 'lib/domain_name/version.rb'
 

data/data/{effective_tld_names.dat → public_suffix_list.dat}

@@ -2,6 +2,11 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
+// Please pull this list from, and only from https://publicsuffix.org/list/public_suffix_list.dat,
+// rather than any other VCS sites. Pulling from any other URL is not guaranteed to be supported.
+
+// Instructions on pulling and using this list can be found at https://publicsuffix.org/list/.
+
 // ===BEGIN ICANN DOMAINS===
 
 // ac : https://en.wikipedia.org/wiki/.ac
@@ -699,7 +704,9 @@ org.cw
 cx
 gov.cx
 
-// cy : https://en.wikipedia.org/wiki/.cy
+// cy : http://www.nic.cy/
+// Submitted by registry Panayiotou Fotia <cydns@ucy.ac.cy>
+cy
 ac.cy
 biz.cy
 com.cy
@@ -2545,7 +2552,6 @@ hitoyoshi.kumamoto.jp
 kamiamakusa.kumamoto.jp
 kashima.kumamoto.jp
 kikuchi.kumamoto.jp
-kosa.kumamoto.jp
 kumamoto.kumamoto.jp
 mashiki.kumamoto.jp
 mifune.kumamoto.jp
@@ -4363,9 +4369,17 @@ edu.my
 mil.my
 name.my
 
-// mz : http://www.gobin.info/domainname/mz-template.doc
-*.mz
-!teledata.mz
+// mz : http://www.uem.mz/
+// Submitted by registry <antonio@uem.mz>
+mz
+ac.mz
+adv.mz
+co.mz
+edu.mz
+gov.mz
+mil.mz
+net.mz
+org.mz
 
 // na : http://www.na-nic.com.na/
 // http://www.info.na/domain/
@@ -6527,7 +6541,7 @@ lib.ca.us
 lib.co.us
 lib.ct.us
 lib.dc.us
-lib.de.us
+// lib.de.us  Issue #243 - Moved to Private section at request of Ed Moore <Ed.Moore@lib.de.us>
 lib.fl.us
 lib.ga.us
 lib.gu.us
@@ -6943,7 +6957,7 @@ sch.zm
 *.zw
 
 
-// List of new gTLDs imported from https://newgtlds.icann.org/newgtlds.csv on 2016-05-09T22:17:27Z
+// List of new gTLDs imported from https://newgtlds.icann.org/newgtlds.csv on 2016-08-17T00:17:46Z
 
 // aaa : 2015-02-26 American Automobile Association, Inc.
 aaa
@@ -7020,9 +7034,6 @@ afl
 // africa : 2014-03-24 ZA Central Registry NPC trading as Registry.Africa
 africa
 
-// africamagic : 2015-03-05 Electronic Media Network (Pty) Ltd
-africamagic
-
 // agakhan : 2015-04-23 Fondation Aga Khan (Aga Khan Foundation)
 agakhan
 
@@ -7302,7 +7313,7 @@ blanco
 // blockbuster : 2015-07-30 Dish DBS Corporation
 blockbuster
 
-// blog : 2015-05-14 PRIMER NIVEL S.A.
+// blog : 2015-05-14
 blog
 
 // bloomberg : 2014-07-17 Bloomberg IP Holdings LLC
@@ -7728,6 +7739,9 @@ dad
 // dance : 2013-10-24 United TLD Holdco Ltd.
 dance
 
+// data : 2016-06-02 Dish DBS Corporation
+data
+
 // date : 2014-11-20 dot Date Limited
 date
 
@@ -7824,6 +7838,9 @@ dnp
 // docs : 2014-10-16 Charleston Road Registry Inc.
 docs
 
+// doctor : 2016-06-02 Brice Trail, LLC
+doctor
+
 // dodge : 2015-07-30 FCA US LLC.
 dodge
 
@@ -7845,9 +7862,6 @@ download
 // drive : 2015-03-05 Charleston Road Registry Inc.
 drive
 
-// dstv : 2015-03-12 MultiChoice (Proprietary) Limited
-dstv
-
 // dtv : 2015-06-04 Dish DBS Corporation
 dtv
 
@@ -7872,6 +7886,9 @@ durban
 // dvag : 2014-06-23 Deutsche Vermögensberatung Aktiengesellschaft DVAG
 dvag
 
+// dvr : 2016-05-26 Hughes Satellite Systems Corporation
+dvr
+
 // dwg : 2015-07-23 Autodesk, Inc.
 dwg
 
@@ -7881,6 +7898,9 @@ earth
 // eat : 2014-01-23 Charleston Road Registry Inc.
 eat
 
+// eco : 2016-07-08 Big Room Inc.
+eco
+
 // edeka : 2014-12-18 EDEKA Verband kaufmännischer Genossenschaften e.V.
 edeka
 
@@ -8064,9 +8084,6 @@ florist
 // flowers : 2014-10-09 Uniregistry, Corp.
 flowers
 
-// flsmidth : 2014-07-24 FLSmidth A/S
-flsmidth
-
 // fly : 2014-05-08 Charleston Road Registry Inc.
 fly
 
@@ -8157,7 +8174,7 @@ gallup
 // game : 2015-05-28 Uniregistry, Corp.
 game
 
-// games : 2015-05-28 Foggy Beach, LLC
+// games : 2015-05-28
 games
 
 // gap : 2015-07-31 The Gap, Inc.
@@ -8259,9 +8276,6 @@ gop
 // got : 2014-12-18 Amazon EU S.à r.l.
 got
 
-// gotv : 2015-03-12 MultiChoice (Proprietary) Limited
-gotv
-
 // grainger : 2015-05-07 Grainger Registry Services, LLC
 grainger
 
@@ -8277,6 +8291,9 @@ green
 // gripe : 2014-03-06 Corn Sunset, LLC
 gripe
 
+// grocery : 2016-06-16 Wal-Mart Stores, Inc.
+grocery
+
 // group : 2014-08-15 Romeo Town, LLC
 group
 
@@ -8640,9 +8657,6 @@ kred
 // kuokgroup : 2015-04-09 Kerry Trading Co. Limited
 kuokgroup
 
-// kyknet : 2015-03-05 Electronic Media Network (Pty) Ltd
-kyknet
-
 // kyoto : 2014-11-07 Academic Institution: Kyoto Jyoho Gakuen
 kyoto
 
@@ -8847,6 +8861,9 @@ management
 // mango : 2013-10-24 PUNTO FA S.L.
 mango
 
+// map : 2016-06-09 Charleston Road Registry Inc.
+map
+
 // market : 2014-03-06
 market
 
@@ -8907,6 +8924,9 @@ menu
 // meo : 2014-11-07 PT Comunicacoes S.A.
 meo
 
+// merckmsd : 2016-07-14 MSD Registry Holdings, Inc.
+merckmsd
+
 // metlife : 2015-05-07 MetLife Services and Solutions, LLC
 metlife
 
@@ -8937,8 +8957,8 @@ mls
 // mma : 2014-11-07 MMA IARD
 mma
 
-// mnet : 2015-03-05 Electronic Media Network (Pty) Ltd
-mnet
+// mobile : 2016-06-02 Dish DBS Corporation
+mobile
 
 // mobily : 2014-12-18 GreenTech Consultancy Company W.L.L.
 mobily
@@ -9006,18 +9026,12 @@ mtpc
 // mtr : 2015-03-12 MTR Corporation Limited
 mtr
 
-// multichoice : 2015-03-12 MultiChoice (Proprietary) Limited
-multichoice
-
 // mutual : 2015-04-02 Northwestern Mutual MU TLD Registry, LLC
 mutual
 
 // mutuelle : 2015-06-18 Fédération Nationale de la Mutualité Française
 mutuelle
 
-// mzansimagic : 2015-03-05 Electronic Media Network (Pty) Ltd
-mzansimagic
-
 // nab : 2015-08-20 National Australia Bank Limited
 nab
 
@@ -9027,9 +9041,6 @@ nadex
 // nagoya : 2013-10-24 GMO Registry, Inc.
 nagoya
 
-// naspers : 2015-02-12 Intelprop (Proprietary) Limited
-naspers
-
 // nationwide : 2015-07-23 Nationwide Mutual Insurance Company
 nationwide
 
@@ -9192,7 +9203,7 @@ orange
 // organic : 2014-03-27 Afilias Limited
 organic
 
-// orientexpress : 2015-02-05 Belmond Ltd.
+// orientexpress : 2015-02-05
 orientexpress
 
 // origins : 2015-10-01 The Estée Lauder Companies Inc.
@@ -9243,9 +9254,6 @@ passagens
 // pay : 2015-08-27 Amazon EU S.à r.l.
 pay
 
-// payu : 2015-02-12 MIH PayU B.V.
-payu
-
 // pccw : 2015-05-14 PCCW Enterprises Limited
 pccw
 
@@ -9258,9 +9266,15 @@ pfizer
 // pharmacy : 2014-06-19 National Association of Boards of Pharmacy
 pharmacy
 
+// phd : 2016-07-28 Charleston Road Registry Inc.
+phd
+
 // philips : 2014-11-07 Koninklijke Philips N.V.
 philips
 
+// phone : 2016-06-02 Dish DBS Corporation
+phone
+
 // photo : 2013-11-14 Uniregistry, Corp.
 photo
 
@@ -9396,6 +9410,9 @@ qvc
 // racing : 2014-12-04 Premier Registry Limited
 racing
 
+// radio : 2016-07-21 European Broadcasting Union (EBU)
+radio
+
 // raid : 2015-07-23 Johnson Shareholdings, Inc.
 raid
 
@@ -9618,6 +9635,9 @@ scor
 // scot : 2014-01-23 Dot Scot Registry Limited
 scot
 
+// search : 2016-06-09 Charleston Road Registry Inc.
+search
+
 // seat : 2014-05-22 SEAT, S.A. (Sociedad Unipersonal)
 seat
 
@@ -9831,9 +9851,6 @@ style
 // sucks : 2014-12-22 Vox Populi Registry Inc.
 sucks
 
-// supersport : 2015-03-05 SuperSport International Holdings Proprietary Limited
-supersport
-
 // supplies : 2013-12-19 Atomic Fields, LLC
 supplies
 
@@ -10628,34 +10645,42 @@ zuerich
 // ===BEGIN PRIVATE DOMAINS===
 // (Note: these are in alphabetical order by company name)
 
+// Agnat sp. z o.o. : https://domena.pl
+// Submitted by Przemyslaw Plewa <it-admin@domena.pl>
+beep.pl
+
 // Alces Software Ltd : http://alces-software.com
 // Submitted by Mark J. Titorenko <mark.titorenko@alces-software.com>
 *.compute.estate
 *.alces.network
 
+// alwaysdata : https://www.alwaysdata.com
+// Submitted by Cyril <admin@alwaysdata.com>
+*.alwaysdata.net
+
 // Amazon CloudFront : https://aws.amazon.com/cloudfront/
 // Submitted by Donavan Miller <donavanm@amazon.com>
 cloudfront.net
 
 // Amazon Elastic Compute Cloud: https://aws.amazon.com/ec2/
-// Submitted by Luke Wells <lawells@amazon.com>
+// Submitted by Philip Allchin <pallchin@amazon.com>
+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
+compute-1.amazonaws.com
 z-1.compute-1.amazonaws.com
 z-2.compute-1.amazonaws.com
+us-east-1.amazonaws.com
+compute.amazonaws.com.cn
+cn-north-1.compute.amazonaws.com.cn
 
 // Amazon Elastic Beanstalk : https://aws.amazon.com/elasticbeanstalk/
 // Submitted by Adam Stein <astein@amazon.com>
@@ -10691,23 +10716,43 @@ on-aptible.com
 
 // Association potager.org : https://potager.org/
 // Submitted by Lunar <jardiniers@potager.org>
-potager.org
+pimienta.org
 poivron.org
+potager.org
 sweetpepper.org
-pimienta.org
+
+// ASUSTOR Inc. : http://www.asustor.com
+// Submitted by Vincent Tseng <vincenttseng@asustor.com>
+myasustor.com
 
 // AVM : https://avm.de
 // Submitted by Andreas Weise <a.weise@avm.de>
 myfritz.net
 
+// backplane : https://www.backplane.io
+// Submitted by Anthony Voutas <anthony@backplane.io>
+backplaneapp.io
+
 // BetaInABox
 // Submitted by Adrian <adrian@betainabox.com>
 betainabox.com
 
+// BinaryLane : http://www.binarylane.com
+// Submitted by Nathan O'Sullivan <nathan@mammoth.com.au>
+bnr.la
+
 // Boxfuse : https://boxfuse.com
 // Submitted by Axel Fontaine <axel@boxfuse.com>
 boxfuse.io
 
+// BrowserSafetyMark
+// Submitted by Dave Tharp <browsersafetymark.io@quicinc.com>
+browsersafetymark.io
+
+// callidomus: https://www.callidomus.com/
+// Submitted by Marcus Popp <admin@callidomus.com>
+mycd.eu
+
 // CentralNic : http://www.centralnic.com/names/domains
 // Submitted by registry <gavin.brown@centralnic.com>
 ae.org
@@ -10762,10 +10807,18 @@ co.com
 // c.la : http://www.c.la/
 c.la
 
+// certmgr.org : https://certmgr.org
+// Submitted by B. Blechschmidt <hostmaster@certmgr.org>
+certmgr.org
+
 // Citrix : https://citrix.com
 // Submitted by Alex Stoddard <alex.stoddard@citrix.com>
 xenapponazure.com
 
+// ClearVox : http://www.clearvox.nl/
+// Submitted by Leon Rowland <leon@clearvox.nl>
+virtueeldomein.nl
+
 // cloudControl : https://www.cloudcontrol.com/
 // Submitted by Tobias Wilken <tw@cloudcontrol.com>
 cloudcontrolled.com
@@ -10786,6 +10839,20 @@ r.cdn77.net
 rsc.cdn77.org
 ssl.origin.cdn77-secure.org
 
+// Cloud DNS Ltd : http://www.cloudns.net
+// Submitted by Aleksander Hristov <noc@cloudns.net>
+cloudns.asia
+cloudns.biz
+cloudns.club
+cloudns.cc
+cloudns.eu
+cloudns.in
+cloudns.info
+cloudns.org
+cloudns.pro
+cloudns.pw
+cloudns.us
+
 // CoDNS B.V.
 co.nl
 co.no
@@ -10794,6 +10861,14 @@ co.no
 // Submitted by Damien Tournoud <damien@commerceguys.com>
 *.platform.sh
 
+// Craynic, s.r.o. : http://www.craynic.com/
+// Submitted by Ales Krajnik <ales.krajnik@craynic.com>
+realm.cz
+
+// Cryptonomic : https://cryptonomic.net/
+// Submitted by Andrew Cady <public-suffix-list@cryptonomic.net>
+*.cryptonomic.net
+
 // Cupcake : https://cupcake.io/
 // Submitted by Jonathan Rudenberg <jonathan@cupcake.io>
 cupcake.is
@@ -10831,6 +10906,11 @@ dreamhosters.com
 // Submitted by Ricardo Padilha <rpadilha@drobo.com>
 mydrobo.com
 
+// Drud Holdings, LLC. : https://www.drud.com/
+// Submitted by Kevin Bridges <kevin@drud.com>
+drud.io
+drud.us
+
 // DuckDNS : http://www.duckdns.org/
 // Submitted by Richard Harper <richard@duckdns.org>
 duckdns.org
@@ -11188,6 +11268,13 @@ tr.eu.org
 uk.eu.org
 us.eu.org
 
+// Evennode : http://www.evennode.com/
+// Submitted by Michal Kralik <support@evennode.com>
+eu-1.evennode.com
+eu-2.evennode.com
+us-1.evennode.com
+us-2.evennode.com
+
 // Facebook, Inc.
 // Submitted by Peter Ruibal <public-suffix@fb.com>
 apps.fbsbx.com
@@ -11200,6 +11287,10 @@ 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
+
 // Firebase, Inc.
 // Submitted by Chris Raynor <chris@firebase.com>
 firebaseapp.com
@@ -11217,6 +11308,16 @@ fbxos.fr
 freebox-os.fr
 freeboxos.fr
 
+// Fusion Intranet : https://www.fusion-intranet.com
+// Submitted by Matthias Burtscher <matthias.burtscher@fusonic.net>
+myfusion.cloud
+
+// Futureweb OG : http://www.futureweb.at
+// Submitted by Andreas Schnederle-Wagner <schnederle@futureweb.at>
+futuremailing.at
+*.ex.ortsinfo.at
+*.kunden.ortsinfo.at
+
 // GDS : https://www.gov.uk/service-manual/operations/operating-servicegovuk-subdomains
 // Submitted by David Illsley <david.illsley@digital.cabinet-office.gov.uk>
 service.gov.uk
@@ -11231,9 +11332,15 @@ githubcloud.com
 gist.githubcloud.com
 *.githubcloudusercontent.com
 
+// GitLab, Inc.
+// Submitted by Alex Hanselka <alex@gitlab.com>
+gitlab.io
+
 // GlobeHosting, Inc.
 // Submitted by Zoltan Egresi <egresi@globehosting.com>
 ro.com
+ro.im
+shop.ro
 
 // GoIP DNS Services : http://www.goip.de
 // Submitted by Christian Poulter <milchstrasse@goip.de>
@@ -11322,6 +11429,7 @@ codespot.com
 googleapis.com
 googlecode.com
 pagespeedmobilizer.com
+publishproxy.com
 withgoogle.com
 withyoutube.com
 
@@ -11332,6 +11440,10 @@ hashbang.sh
 // Submitted by Shahidh K Muhammed <shahidh@hasura.io>
 hasura-app.io
 
+// Hepforge : https://www.hepforge.org
+// Submitted by David Grellscheid <admin@hepforge.org>
+hepforge.org
+
 // Heroku : https://www.heroku.com/
 // Submitted by Tom Maher <tmaher@heroku.com>
 herokuapp.com
@@ -11345,6 +11457,66 @@ iki.fi
 biz.at
 info.at
 
+// Interlegis : http://www.interlegis.leg.br
+// Submitted by Gabriel Ferreira <registrobr@interlegis.leg.br>
+ac.leg.br
+al.leg.br
+am.leg.br
+ap.leg.br
+ba.leg.br
+ce.leg.br
+df.leg.br
+es.leg.br
+go.leg.br
+ma.leg.br
+mg.leg.br
+ms.leg.br
+mt.leg.br
+pa.leg.br
+pb.leg.br
+pe.leg.br
+pi.leg.br
+pr.leg.br
+rj.leg.br
+rn.leg.br
+ro.leg.br
+rr.leg.br
+rs.leg.br
+sc.leg.br
+se.leg.br
+sp.leg.br
+to.leg.br
+
+// Joyent : https://www.joyent.com/
+// Submitted by Brian Bennett <brian.bennett@joyent.com>
+*.triton.zone
+*.cns.joyent.com
+
+// JS.ORG : http://dns.js.org
+// Submitted by Stefan Keim <admin@js.org>
+js.org
+
+// Keyweb AG : https://www.keyweb.de
+// Submitted by Martin Dannehl <postmaster@keymachine.de>
+keymachine.de
+
+// KnightPoint Systems, LLC : http://www.knightpoint.com/
+// Submitted by Roy Keene <rkeene@knightpoint.com>
+knightpoint.systems
+
+// .KRD : http://nic.krd/data/krd/Registration%20Policy.pdf
+co.krd
+edu.krd
+
+// Magento Commerce
+// Submitted by Damien Tournoud <dtournoud@magento.cloud>
+*.magentosite.cloud
+
+// Meteor Development Group : https://www.meteor.com/hosting
+// Submitted by Pierre Carrier <pierre@meteor.com>
+meteorapp.com
+eu.meteorapp.com
+
 // Michau Enterprises Limited : http://www.co.pl/
 co.pl
 
@@ -11471,6 +11643,10 @@ nyc.mn
 // Submitted by Eddie Jones <eddie@onefoldmedia.com>
 nid.io
 
+// OpenCraft GmbH : http://opencraft.com/
+// Submitted by Sven Marnach <sven@opencraft.com>
+opencraft.hosting
+
 // Opera Software, A.S.A.
 // Submitted by Yngve Pettersen <yngve@opera.com>
 operaunite.com
@@ -11520,6 +11696,10 @@ xen.prgmr.com
 // Submitted by registry <lendl@nic.at>
 priv.at
 
+// Protonet GmbH : http://protonet.io
+// Submitted by Martin Meier <admin@protonet.io>
+protonet.io
+
 // Publication Presse Communication SARL : https://ppcom.fr
 // Submitted by Yaacov Akiba Slama <admin@chirurgiens-dentistes-en-france.fr>
 chirurgiens-dentistes-en-france.fr
@@ -11528,6 +11708,12 @@ chirurgiens-dentistes-en-france.fr
 // Submitted by Daniel Dent (https://www.danieldent.com/)
 qa2.com
 
+// QNAP System Inc : https://www.qnap.com
+// Submitted by Nick Chang <nickchang@qnap.com>
+dev-myqnapcloud.com
+alpha-myqnapcloud.com
+myqnapcloud.com
+
 // Rackmaze LLC : https://www.rackmaze.com
 // Submitted by Kirill Pertsev <kika@rackmaze.com>
 rackmaze.com
@@ -11541,16 +11727,31 @@ rhcloud.com
 // Submitted by Chris Kastorff <info@rethinkdb.com>
 hzc.io
 
+// Revitalised Limited : http://www.revitalised.co.uk
+// Submitted by Jack Price <jack@revitalised.co.uk>
+wellbeingzone.eu
+ptplus.fit
+wellbeingzone.co.uk
+
 // Sandstorm Development Group, Inc. : https://sandcats.io/
 // Submitted by Asheesh Laroia <asheesh@sandstorm.io>
 sandcats.io
 
+// SBE network solutions GmbH : https://www.sbe.de/
+// Submitted by Norman Meilick <nm@sbe.de>
+logoip.de
+logoip.com
+
 // Service Online LLC : http://drs.ua/
 // Submitted by Serhii Bulakh <support@drs.ua>
 biz.ua
 co.ua
 pp.ua
 
+// Shopblocks : http://www.shopblocks.com/
+// Submitted by Alex Bowers <alex@shopblocks.com>
+myshopblocks.com
+
 // SinaAppEngine : http://sae.sina.com.cn/
 // Submitted by SinaAppEngine <saesupport@sinacloud.com>
 sinaapp.com
@@ -11563,10 +11764,20 @@ bounty-full.com
 alpha.bounty-full.com
 beta.bounty-full.com
 
+// staticland : https://static.land
+// Submitted by Seth Vincent <sethvincent@gmail.com>
+static.land
+dev.static.land
+sites.static.land
+
 // SpaceKit : https://www.spacekit.io/
 // Submitted by Reza Akhavan <spacekit.io@gmail.com>
 spacekit.io
 
+// Stackspace : https://www.stackspace.io/
+// Submitted by Lina He <info@stackspace.io>
+stackspace.space
+
 // Synology, Inc. : https://www.synology.com/
 // Submitted by Rony Weng <ronyweng@synology.com>
 diskstation.me
@@ -11583,6 +11794,10 @@ i234.me
 myds.me
 synology.me
 
+// TAIFUN Software AG : http://taifun-software.de
+// Submitted by Bjoern Henke <dev-server@taifun-software.de>
+taifun-dns.de
+
 // TASK geographical domains (www.task.gda.pl/uslugi/dns)
 gda.pl
 gdansk.pl
@@ -11590,11 +11805,21 @@ gdynia.pl
 med.pl
 sopot.pl
 
-// TownNews.com domains : http://www.townnews.com
+// TownNews.com : http://www.townnews.com
 // Submitted by Dustin Ward <dward@townnews.com>
 bloxcms.com
 townnews-staging.com
 
+// TransIP : htts://www.transip.nl
+// Submitted by Rory Breuk <rbreuk@transip.nl>
+*.transurl.be
+*.transurl.eu
+*.transurl.nl
+
+// TuxFamily : http://tuxfamily.org
+// Submitted by TuxFamily administrators <adm@staff.tuxfamily.org>
+tuxfamily.org
+
 // UDR Limited : http://www.udr.hk.com
 // Submitted by registry <hostmaster@udr.hk.com>
 hk.com
@@ -11602,10 +11827,18 @@ hk.org
 ltd.hk
 inc.hk
 
+// .US
+// Submitted by Ed Moore <Ed.Moore@lib.de.us>
+lib.de.us
+
 // Viprinet Europe GmbH : http://www.viprinet.com
 // Submitted by Simon Kissel <hostmaster@viprinet.com>
 router.management
 
+// Wikimedia Labs : https://wikitech.wikimedia.org
+// Submitted by Yuvi Panda <yuvipanda@wikimedia.org>
+wmflabs.org
+
 // Yola : https://www.yola.com/
 // Submitted by Stefano Rivera <stefano@yola.com>
 yolasite.com