Bug #78793 for Domain-PublicSuffix: updating Domain::PublicSuffix::Default.pm

Hi Nicholas-- I'm looking at packaging Domain::PublicSuffix for inclusion within debian: http://bugs.debian.org/683948 digging around, i note that you've got the following copyright notice embedded in lib/Domain/PublicSuffix/Default.pm: // 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@wackomenace.co.uk> // Gervase Markham <gerv@gerv.net> // Pamela Greene <pamg.bugs@gmail.com> // David Triendl <david@triendl.name> // 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. // // ***** END LICENSE BLOCK ***** ----------------- however, a look at the latest version of the public suffix list contains only the following copyright/licensing header: // 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 // file, You can obtain one at http://mozilla.org/MPL/2.0/. here's where i'm getting the latest version from: https://hg.mozilla.org/mozilla-central/raw-file/tip/netwerk/dns/effective_tld_names.dat Also, Domain::PublicSuffix 0.05 appears to claim to have been updated on 2012-07-17, but the above link (last-updated on 2012-07-07, as of this date) contains many more suffixes than are included in Default.pm. Perhaps the Default.pm was being updated from an unmaintained source? Does it need another update? In debian, i'm also hoping to ship effective_tld_names.dat raw (in a separate package named "publicsuffix"), so that other tools on the system can rely on a centrally-updated version. If all goes as planned, publicsuffix will ship that file as /usr/share/publicsuffix/effective_tld_names.dat. The attached patch adds /usr/share/publicsuffix to Domain::PublicSuffix's search path; i'd be happy to see it included upstream if you want it. Thanks for publishing and maintaining this package! --dkg

diff --git a/lib/Domain/PublicSuffix.pm b/lib/Domain/PublicSuffix.pm index 25d7f39..904c290 100755 --- a/lib/Domain/PublicSuffix.pm +++ b/lib/Domain/PublicSuffix.pm @@ -45,7 +45,7 @@ The Mozilla PublicSuffix file is an open source, fully documented format that shows absolute root TLDs, primarily for Mozilla's browser products to be able to determine how far a cookie's security boundaries go. -This module will attempt to search etc directories in /usr, /usr/local, and +This module will attempt to search etc directories in /usr/share/publicsuffix, /usr, /usr/local, and /opt/local for the effective_tld_names.dat file. If a file is not found, a default file is loaded from Domain::PublicSuffix::Default, which is current at the time of the module's release. You can override the data file path by @@ -237,6 +237,7 @@ sub _parse_data_file { } else { my @paths = ( + File::Spec->catdir(File::Spec->rootdir, qw/ usr share publicsuffix /), File::Spec->catdir(File::Spec->rootdir, qw/ etc /), File::Spec->catdir(File::Spec->rootdir, qw/ usr etc /), File::Spec->catdir(File::Spec->rootdir, qw/ usr local etc /), @@ -409,4 +410,4 @@ under the same terms as Perl itself. =cut -1; \ No newline at end of file +1;