Compare commits

...

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

8 changed files with 182 additions and 23 deletions

1
.fmf/version Normal file
View File

@ -0,0 +1 @@
1

7
.gitignore vendored
View File

@ -1,4 +1,3 @@
SOURCES/GeoLite2-City_20180605.tar.gz
SOURCES/GeoLite2-Country_20180605.tar.gz
/GeoLite2-City_20180605.tar.gz
/GeoLite2-Country_20180605.tar.gz
GeoLite2-ASN_*.tar.gz
GeoLite2-City_*.tar.gz
GeoLite2-Country_*.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)

1
ci.fmf Normal file
View File

@ -0,0 +1 @@
resultsdb-testcase: separate

View File

@ -1,6 +1,25 @@
--- !Policy
product_versions:
- rhel-8
- fedora-*
decision_context: bodhi_update_push_testing
subject_type: koji_build
rules:
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional}
#Rawhide
--- !Policy
product_versions:
- fedora-*
decision_context: bodhi_update_push_stable
subject_type: koji_build
rules:
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional}
#gating rhel
--- !Policy
product_versions:
- rhel-*
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}
- !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-public.functional}
- !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-internal.functional}

View File

@ -1,45 +1,66 @@
%global _docdir_fmt %{name}
%global _description \
GeoLite2 databases are free IP geolocation databases comparable to, but less\
accurate than, MaxMind's GeoIP2 databases. This product includes GeoLite2 data\
created by MaxMind, available from http://www.maxmind.com.
%global common_description %{expand:
GeoLite2 databases are free IP geolocation databases comparable to, but less
accurate than, MaxMind's GeoIP2 databases. This product includes GeoLite2 data
created by MaxMind, available from http://www.maxmind.com.}
Name: geolite2
Version: 20180605
Release: 1%{?dist}
# Upstream changed their license on 2019-12-30. This is the last version
# released under CC-BY-SA.
# https://bugzilla.redhat.com/show_bug.cgi?id=1786211
Version: 20191217
Release: 14%{?dist}
Summary: Free IP geolocation databases
License: CC-BY-SA
# This work is licensed under the Creative Commons Attribution-ShareAlike 4.0 International License
# This database incorporates GeoNames geographical data, which is made available under the Creative Commons Attribution 3.0 License
License: CC-BY-SA-4.0 AND CC-BY-3.0
URL: https://dev.maxmind.com/geoip/geoip2/geolite2/
Source0: https://geolite.maxmind.com/download/geoip/database/GeoLite2-City_%{version}.tar.gz
Source1: https://geolite.maxmind.com/download/geoip/database/GeoLite2-Country_%{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-City_%{version}.tar.gz
Source2: https://geolite.maxmind.com/download/geoip/database/GeoLite2-Country_%{version}.tar.gz
BuildArch: noarch
%description %{_description}
%description %{common_description}
%package asn
Summary: Free IP geolocation ASN database
%description asn %{common_description}
%package city
Summary: Free IP geolocation city database
%description city %{_description}
%description city %{common_description}
%package country
Summary: Free IP geolocation country database
%description country %{_description}
%description country %{common_description}
%prep
%setup -q -T -c -a 0 -a 1
%setup -q -T -c -a 0 -a 1 -a 2
%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
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
%license GeoLite2-City_%{version}/COPYRIGHT.txt GeoLite2-City_%{version}/LICENSE.txt
%dir %{_datadir}/GeoIP
@ -53,6 +74,83 @@ done
%changelog
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 20191217-14
- Bump release for October 2024 mass rebuild:
Resolves: RHEL-64018
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 20191217-13
- Bump release for June 2024 mass rebuild
* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 20191217-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 20191217-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 20191217-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Fri Mar 3 2023 Paul Howarth <paul@city-fan.org> - 20191217-9
- Use SPDX-format license tag
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 20191217-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 20191217-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 20191217-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 20191217-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* 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
- Latest upstream

36
plans.fmf Normal file
View File

@ -0,0 +1,36 @@
/tier1-internal:
plan:
import:
url: https://src.fedoraproject.org/tests/geolite2.git
name: /plans/tier1/internal
/tier1-public:
plan:
import:
url: https://src.fedoraproject.org/tests/geolite2.git
name: /plans/tier1/public
/tier2-tier3-internal:
plan:
import:
url: https://src.fedoraproject.org/tests/geolite2.git
name: /plans/tier2-tier3/internal
/tier2-tier3-public:
plan:
import:
url: https://src.fedoraproject.org/tests/geolite2.git
name: /plans/tier2-tier3/public
/others-internal:
plan:
import:
url: https://src.fedoraproject.org/tests/geolite2.git
name: /plans/others/internal
/others-public:
plan:
import:
url: https://src.fedoraproject.org/tests/geolite2.git
name: /plans/others/public

View File

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