Compare commits

..

No commits in common. "c8s" and "1bf9bd28fbe35be77c8587d899dc54ae99104f49" have entirely different histories.

6 changed files with 101 additions and 21 deletions

3
.geolite2.metadata Normal file
View File

@ -0,0 +1,3 @@
b1ce099400e5cdc7c39319b2452db085afbe9907 GeoLite2-ASN_20191217.tar.gz
6cb7a6a8552b517ac9fa7bfd21f519c81267040b GeoLite2-City_20191217.tar.gz
e38b8a60860309a5e7a6e52c1f955a5211c59365 GeoLite2-Country_20191217.tar.gz

7
.gitignore vendored
View File

@ -1,4 +1,3 @@
SOURCES/GeoLite2-City_20180605.tar.gz GeoLite2-ASN_*.tar.gz
SOURCES/GeoLite2-Country_20180605.tar.gz GeoLite2-City_*.tar.gz
/GeoLite2-City_20180605.tar.gz GeoLite2-Country_*.tar.gz
/GeoLite2-Country_20180605.tar.gz

4
README.md Normal file
View File

@ -0,0 +1,4 @@
Upstream changed their license on 2019-12-30. The currently packaged version
(20191217) is the last version released under CC-BY-SA.
[rhbz#1786211](https://bugzilla.redhat.com/show_bug.cgi?id=1786211)

View File

@ -1,6 +1,7 @@
--- !Policy --- !Policy
product_versions: product_versions:
- rhel-8 - rhel-9
decision_context: osci_compose_gate decision_context: osci_compose_gate
rules: rules:
- !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional} - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}
- !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tedude.validation}

View File

@ -1,45 +1,64 @@
%global _docdir_fmt %{name} %global common_description %{expand:
%global _description \ GeoLite2 databases are free IP geolocation databases comparable to, but less
GeoLite2 databases are free IP geolocation databases comparable to, but less\ accurate than, MaxMind's GeoIP2 databases. This product includes GeoLite2 data
accurate than, MaxMind's GeoIP2 databases. This product includes GeoLite2 data\ created by MaxMind, available from http://www.maxmind.com.}
created by MaxMind, available from http://www.maxmind.com.
Name: geolite2 Name: geolite2
Version: 20180605 # Upstream changed their license on 2019-12-30. This is the last version
Release: 1%{?dist} # released under CC-BY-SA.
# https://bugzilla.redhat.com/show_bug.cgi?id=1786211
Version: 20191217
Release: 6%{?dist}
Summary: Free IP geolocation databases Summary: Free IP geolocation databases
License: CC-BY-SA License: CC-BY-SA
URL: https://dev.maxmind.com/geoip/geoip2/geolite2/ URL: https://dev.maxmind.com/geoip/geoip2/geolite2/
Source0: https://geolite.maxmind.com/download/geoip/database/GeoLite2-City_%{version}.tar.gz Source0: https://geolite.maxmind.com/download/geoip/database/GeoLite2-ASN_%{version}.tar.gz
Source1: https://geolite.maxmind.com/download/geoip/database/GeoLite2-Country_%{version}.tar.gz Source1: https://geolite.maxmind.com/download/geoip/database/GeoLite2-City_%{version}.tar.gz
Source2: https://geolite.maxmind.com/download/geoip/database/GeoLite2-Country_%{version}.tar.gz
BuildArch: noarch BuildArch: noarch
%description %{_description} %description %{common_description}
%package asn
Summary: Free IP geolocation ASN database
%description asn %{common_description}
%package city %package city
Summary: Free IP geolocation city database Summary: Free IP geolocation city database
%description city %{_description}
%description city %{common_description}
%package country %package country
Summary: Free IP geolocation country database Summary: Free IP geolocation country database
%description country %{_description}
%description country %{common_description}
%prep %prep
%setup -q -T -c -a 0 -a 1 %setup -q -T -c -a 0 -a 1 -a 2
%install %install
for db in GeoLite2-City GeoLite2-Country; do for db in GeoLite2-{ASN,City,Country}; do
install -D -p -m 0644 ${db}_%{version}/$db.mmdb %{buildroot}%{_datadir}/GeoIP/$db.mmdb install -D -p -m 0644 ${db}_%{version}/$db.mmdb %{buildroot}%{_datadir}/GeoIP/$db.mmdb
done done
%files asn
%license GeoLite2-ASN_%{version}/COPYRIGHT.txt GeoLite2-ASN_%{version}/LICENSE.txt
%dir %{_datadir}/GeoIP
%verify(not md5 size mtime) %{_datadir}/GeoIP/GeoLite2-ASN.mmdb
%files city %files city
%license GeoLite2-City_%{version}/COPYRIGHT.txt GeoLite2-City_%{version}/LICENSE.txt %license GeoLite2-City_%{version}/COPYRIGHT.txt GeoLite2-City_%{version}/LICENSE.txt
%dir %{_datadir}/GeoIP %dir %{_datadir}/GeoIP
@ -53,6 +72,59 @@ done
%changelog %changelog
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 20191217-6
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 20191217-5
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 20191217-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 20191217-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 20191217-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Thu Dec 19 2019 Carl George <carl@george.computer> - 20191217-1
- Latest upstream
* Tue Oct 08 2019 Carl George <carl@george.computer> - 20191008-1
- Latest upstream
* Tue Aug 13 2019 Carl George <carl@george.computer> - 20190806-1
- Latest upstream
- Add ASN subpackage
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 20190618-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Wed Jun 19 2019 Carl George <carl@george.computer> - 20190618-1
- Latest upstream
* Thu Apr 11 2019 Carl George <carl@george.computer> - 20190409-1
- Latest upstream
* Wed Feb 06 2019 Carl George <carl@george.computer> - 20190205-1
- Latest upstream
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 20181204-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Wed Dec 05 2018 Carl George <carl@george.computer> - 20181204-1
- Latest upstream
* Thu Oct 04 2018 Carl George <carl@george.computer> - 20181002-1
- Latest upstream
* Mon Aug 13 2018 Carl George <carl@george.computer> - 20180807-1
- Latest upstream
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 20180605-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Mon Jun 11 2018 Carl George <carl@george.computer> - 20180605-1 * Mon Jun 11 2018 Carl George <carl@george.computer> - 20180605-1
- Latest upstream - Latest upstream

View File

@ -1,2 +1,3 @@
SHA512 (GeoLite2-City_20180605.tar.gz) = e8d7a6d7a734ed49dbf09dcec7b8d4733ce4b3cf237f10f0d3e3a9d41cd3abd9f900f7eb909e56df4e92083c2e6da7032b2f3e4c4d197f63ea645314661dfca7 SHA512 (GeoLite2-ASN_20191217.tar.gz) = 2bc160bf12407cb6a33253f476b67a037ee848aefe43f2ddce2bce6e018971b97fd248b4b5c41e8c48ba5630529647b024ef1dc4558d4009bd80fd8a28e48e31
SHA512 (GeoLite2-Country_20180605.tar.gz) = f01486d8eb56274facdde681c0a18b4abc043e928e45c39a524456906cd7b575c18a157b59a62f86e71568cd5a4eca791f7c1662a54e135bf855e3af7e943dd7 SHA512 (GeoLite2-City_20191217.tar.gz) = b90d98901a2906465e69c69d9ddc95a4d5945deba683a856bc858229e9a7358acf46b4e73b131c7bd497ce4029848e1431fc0efb8bfdc417bd3241d9965e2dae
SHA512 (GeoLite2-Country_20191217.tar.gz) = 650299768e89a4567e3f63ea07e6fe4dd3f53812ed3b4855fa38ee8b59be65f84e6caf296a9cc2d25b4f1c2f014b2c27ae0348e6849d9c84fc6c325502da01d9