diff --git a/.gitignore b/.gitignore index 0091269..936e5a4 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /index.txt /public_suffix_list.dat /test_psl.txt +/psl-make-dafsa diff --git a/publicsuffix-list.spec b/publicsuffix-list.spec index ee118f7..6efb912 100644 --- a/publicsuffix-list.spec +++ b/publicsuffix-list.spec @@ -1,4 +1,4 @@ -%global revdate 20161028 +%global revdate 20161230 Name: publicsuffix-list Version: %{revdate} @@ -8,11 +8,14 @@ Summary: Cross-vendor public domain suffix database License: MPLv2.0 URL: https://publicsuffix.org/ Source0: https://publicsuffix.org/list/public_suffix_list.dat -Source1: https://www.mozilla.org/MPL/2.0/index.txt +Source1: https://www.mozilla.org/media/MPL/2.0/index.txt Source2: https://github.com/publicsuffix/list/raw/master/tests/test_psl.txt +Source3: https://github.com/rockdaboot/libpsl/raw/master/src/psl-make-dafsa BuildArch: noarch +BuildRequires: python3 + %description The Public Suffix List is a cross-vendor initiative to provide @@ -22,16 +25,35 @@ Software using the Public Suffix List will be able to determine where cookies may and may not be set, protecting the user from being tracked across sites. +%package dafsa +Summary: Cross-vendor public domain suffix database in DAFSA form + +%description dafsa +The Public Suffix List is a cross-vendor initiative to provide +an accurate list of domain name suffixes, maintained by the hard work +of Mozilla volunteers and by submissions from registries. +Software using the Public Suffix List will be able to determine where +cookies may and may not be set, protecting the user from being +tracked across sites. + +This package includes a DAFSA representation of the Public Suffix List +for runtime loading. + %prep %setup -c -T +cp -av %{SOURCE0} %{SOURCE3} . cp -av %{SOURCE1} COPYING %build +LC_CTYPE=C.UTF-8 \ +python3 psl-make-dafsa --output-format=binary \ + public_suffix_list.dat public_suffix_list.dafsa %install +install -m 644 -p -D public_suffix_list.dafsa $RPM_BUILD_ROOT/%{_datadir}/publicsuffix/public_suffix_list.dafsa install -m 644 -p -D %{SOURCE0} $RPM_BUILD_ROOT/%{_datadir}/publicsuffix/public_suffix_list.dat install -m 644 -p -D %{SOURCE2} $RPM_BUILD_ROOT/%{_datadir}/publicsuffix/test_psl.txt ln -s public_suffix_list.dat $RPM_BUILD_ROOT/%{_datadir}/publicsuffix/effective_tld_names.dat @@ -39,10 +61,22 @@ ln -s public_suffix_list.dat $RPM_BUILD_ROOT/%{_datadir}/publicsuffix/effective_ %files %license COPYING -%{_datadir}/publicsuffix +%dir %{_datadir}/publicsuffix +%{_datadir}/publicsuffix/effective_tld_names.dat +%{_datadir}/publicsuffix/public_suffix_list.dat +%{_datadir}/publicsuffix/test_psl.txt + +%files dafsa +%license COPYING +%dir %{_datadir}/publicsuffix +%{_datadir}/publicsuffix/public_suffix_list.dafsa %changelog +* Thu Jan 5 2017 Yaakov Selkowitz - 20161230-1 +- Recent revision - 20161230 +- Added dafsa package for runtime use by libpsl + * Fri Nov 4 2016 Yaakov Selkowitz - 20161028-1 - Recent revision - 20161028 diff --git a/sources b/sources index e6c4692..3816ffc 100644 --- a/sources +++ b/sources @@ -1,3 +1,4 @@ -d41d8cd98f00b204e9800998ecf8427e index.txt -0534a0a40e24e3db2b41cfc26308e9ef public_suffix_list.dat -e01583fecbf06ada8544aa7a0766553b test_psl.txt +SHA512 (index.txt) = 200821d8e18270b50208764e1263206d3566b1fc2ed6cf3731d308f690fac0d7333a3e06189ee011dd849a3142fe60e9c5b4a7c599351639715ea3e6df148437 +SHA512 (psl-make-dafsa) = 2282dbc163df7bef4b2f65f835d500e50fcf2623e2bddcfe644e378d47318791cf6dd4d29e6463b4e64b5fe1ed2fb642edf7b99d4ef5e81d4c1a76227f23cbd2 +SHA512 (public_suffix_list.dat) = e6856c67eaa5be4d975171a661ac33c3d3d9545c7469e8005fbcd6acb965ff542174e1945e3848fd34a3d666eb2b652ed4fa627ff0f957cfc6d3ed344a17d986 +SHA512 (test_psl.txt) = 2e3a0a4170fb969ddb928d47f4bbe703137e500c353395ae6172ad097752539075554fc067c63df2e133da791b1b00d54fb928f99fb86d79a7375e38e6cbf310