From 436ffbc0384155d55bc7348ec2845c62cdee961d Mon Sep 17 00:00:00 2001 From: Paul Howarth Date: Sun, 20 Jan 2019 10:46:30 +0000 Subject: [PATCH 01/48] Update to 4.0.2 - New upstream release 4.0.2 - Completely rewritten in the go language - New version licensed ASL 2.0 or MIT rather than GPLv2 - Legacy databases no longer available, so drop/obsolete the cron6 sub-package --- .gitignore | 1 + geoipupdate-4.0.1-flock.patch | 94 +++++++++++++++++++++++ geoipupdate.rpmlintrc | 3 + geoipupdate.spec | 135 ++++++++++++++++++++-------------- geoipupdate6.cron | 37 ---------- sources | 2 +- 6 files changed, 177 insertions(+), 95 deletions(-) create mode 100644 geoipupdate-4.0.1-flock.patch delete mode 100644 geoipupdate6.cron diff --git a/.gitignore b/.gitignore index 25c1dc2..f4a606c 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /geoipupdate-2.5.0.tar.gz /geoipupdate-3.1.0.tar.gz /geoipupdate-3.1.1.tar.gz +/geoipupdate-4.0.2.tar.gz diff --git a/geoipupdate-4.0.1-flock.patch b/geoipupdate-4.0.1-flock.patch new file mode 100644 index 0000000..84b0dc1 --- /dev/null +++ b/geoipupdate-4.0.1-flock.patch @@ -0,0 +1,94 @@ + + * github.com/theckman/go-flock renamed to github.com/gofrs/flock + * flock.NewFlock deprecated: use flock.New instead + +diff --git a/Gopkg.lock b/Gopkg.lock +index 82255c3..47d965c 100644 +--- a/Gopkg.lock ++++ b/Gopkg.lock +@@ -9,6 +9,14 @@ + revision = "346938d642f2ec3594ed81d874461961cd0faa76" + version = "v1.1.0" + ++[[projects]] ++ digest = "1:70f34ee6d1b188cbd2dfcde62b0e2c600262eb5a03c8a3f3435ecf7c74790470" ++ name = "github.com/gofrs/flock" ++ packages = ["."] ++ pruneopts = "UT" ++ revision = "7f43ea2e6a643ad441fc12d0ecc0d3388b300c53" ++ version = "v0.7.0" ++ + [[projects]] + digest = "1:40e195917a951a8bf867cd05de2a46aaf1806c50cf92eebf4c16f78cd196f747" + name = "github.com/pkg/errors" +@@ -34,7 +42,7 @@ + version = "v1.0.1" + + [[projects]] +- digest = "1:befd7181c2f92c9f05abf17cd7e15538919f19cf7871d794cacc45a4fb99c135" ++ digest = "1:c40d65817cdd41fac9aa7af8bed56927bb2d6d47e4fea566a74880f5c2b1c41e" + name = "github.com/stretchr/testify" + packages = [ + "assert", +@@ -44,23 +52,15 @@ + revision = "f35b8ab0b5a2cef36673838d662e249dd9c94686" + version = "v1.2.2" + +-[[projects]] +- digest = "1:e5abcb5d4f4cec8b475f2a812a00c3218fb75f0f792cdeee301e265d22a98cb7" +- name = "github.com/theckman/go-flock" +- packages = ["."] +- pruneopts = "UT" +- revision = "b139a2487364247d91814e4a7c7b8fdc69e342b2" +- version = "v0.4.0" +- + [solve-meta] + analyzer-name = "dep" + analyzer-version = 1 + input-imports = [ ++ "github.com/gofrs/flock", + "github.com/pkg/errors", + "github.com/spf13/pflag", + "github.com/stretchr/testify/assert", + "github.com/stretchr/testify/require", +- "github.com/theckman/go-flock", + ] + solver-name = "gps-cdcl" + solver-version = 1 +diff --git a/Gopkg.toml b/Gopkg.toml +index 0d37060..59fa533 100644 +--- a/Gopkg.toml ++++ b/Gopkg.toml +@@ -34,8 +34,8 @@ + version = "1.2.2" + + [[constraint]] +- name = "github.com/theckman/go-flock" +- version = "0.4.0" ++ name = "github.com/gofrs/flock" ++ version = "0.7.0" + + [prune] + go-tests = true +diff --git a/cmd/geoipupdate/main.go b/cmd/geoipupdate/main.go +index 6693ea6..59932b4 100644 +--- a/cmd/geoipupdate/main.go ++++ b/cmd/geoipupdate/main.go +@@ -16,7 +16,7 @@ import ( + "time" + + "github.com/pkg/errors" +- flock "github.com/theckman/go-flock" ++ "github.com/gofrs/flock" + ) + + // version is the program's version number. +@@ -76,7 +76,7 @@ func setup( + return nil, err + } + +- lock := flock.NewFlock(config.LockFile) ++ lock := flock.New(config.LockFile) + ok, err := lock.TryLock() + if err != nil { + return nil, errors.Wrap(err, "error acquiring a lock") diff --git a/geoipupdate.rpmlintrc b/geoipupdate.rpmlintrc index 54539bf..d5305a6 100644 --- a/geoipupdate.rpmlintrc +++ b/geoipupdate.rpmlintrc @@ -6,6 +6,9 @@ addFilter("no-documentation") # Cron scripts can be edited by end users addFilter("executable-marked-as-config-file /etc/cron.weekly/geoipupdate") +# geoipupdate-cron6 is obsolete (upstream stopped providing free IPv6 databases) and not replaced +addFilter("obsolete-not-provided geoipupdate-cron6") + # Technical term addFilter("spelling-error Summary\(en_US\) Cron -> ") addFilter("spelling-error %description -l en_US Cron -> ") diff --git a/geoipupdate.spec b/geoipupdate.spec index 8f60f04..36f9913 100644 --- a/geoipupdate.spec +++ b/geoipupdate.spec @@ -1,26 +1,30 @@ -%global _hardened_build 1 - +%global forgeurl https://github.com/maxmind/geoipupdate +Version: 4.0.2 +%forgemeta Name: geoipupdate -Version: 3.1.1 Release: 1%{?dist} Summary: Update GeoIP2 and GeoIP Legacy binary databases from MaxMind -License: GPLv2 +License: ASL 2.0 or MIT URL: http://dev.maxmind.com/geoip/geoipupdate/ -Source0: http://github.com/maxmind/geoipupdate/releases/download/v%{version}/geoipupdate-%{version}.tar.gz +Source0: %{forgesource} Source1: geoipupdate.cron -Source2: geoipupdate6.cron +Patch0: geoipupdate-4.0.1-flock.patch +ExclusiveArch: %{go_arches} +BuildRequires: compiler(go-compiler) BuildRequires: coreutils -BuildRequires: gcc -BuildRequires: libcurl-devel +BuildRequires: crontabs +BuildRequires: golang(github.com/pkg/errors) +BuildRequires: golang(github.com/spf13/pflag) +BuildRequires: golang(github.com/stretchr/testify) +BuildRequires: golang(github.com/gofrs/flock) BuildRequires: make -BuildRequires: zlib-devel -# Perl modules used by IPv6 cron script -BuildRequires: perl-generators -BuildRequires: perl(File::Copy) -BuildRequires: perl(File::Spec) -BuildRequires: perl(LWP::Simple) -BuildRequires: perl(PerlIO::gzip) +BuildRequires: pandoc +BuildRequires: perl-interpreter BuildRequires: perl(strict) +BuildRequires: perl(warnings) +BuildRequires: sed +# Legacy databases fetched by cron6 sub-package no longer available +Obsoletes: geoipupdate-cron6 < %{version}-%{release} %description The GeoIP Update program performs automatic updates of GeoIP2 and GeoIP @@ -35,70 +39,87 @@ Obsoletes: GeoIP-update < 1.6.0 Provides: GeoIP-update = 1.6.0 %description cron -Cron job for weekly updates to GeoIP Legacy database from MaxMind. - -%package cron6 -Summary: Cron job to do weekly updates of GeoIP IPv6 databases -BuildArch: noarch -Requires: %{name} = %{version}-%{release} -Requires: crontabs -Requires: wget -Obsoletes: GeoIP-update6 < 1.6.0 -Provides: GeoIP-update6 = 1.6.0 - -%description cron6 -Cron job for weekly updates to GeoIP IPv6 Legacy database from MaxMind. +Cron job for weekly updates to GeoIP2 and GeoIP Legacy binary databases from +MaxMind. %prep -%setup -q +%forgesetup + +# Remove bundled dependencies +rm -rf vendor/ + +# go-flock renamed upstream and new API preferred +# https://github.com/maxmind/geoipupdate/pull/22 +%patch0 -p1 %build -%configure --disable-static --disable-dependency-tracking -make %{?_smp_mflags} +# Set up temporary build gopath and put our directory there +mkdir -p ./_build/src/github.com/maxmind +ln -s $(pwd) ./_build/src/github.com/maxmind/geoipupdate +export GOPATH=$(pwd)/_build:%{gopath} + +# Make the geoipupdate program +cd cmd/geoipupdate +export LDFLAGS='-X main.defaultConfigFile=%{_sysconfdir}/GeoIP.conf -X main.defaultDatabaseDirectory=%{_datadir}/GeoIP' +%gobuild +cd - + +# Work around hardcoded "build" path in dev-bin/make-man-pages.pl +ln -s _build build + +# Prepare the config files and documentation +make BUILDDIR=$(pwd)/_build CONFFILE=%{_sysconfdir}/GeoIP.conf DATADIR=%{_datadir}/GeoIP data %install -make install DESTDIR=%{buildroot} +# Install the geoipupdate program +install -d %{buildroot}%{_bindir} +install -p -m 0755 cmd/geoipupdate/geoipupdate %{buildroot}%{_bindir}/geoipupdate -# We'll package the documentation ourselves -rm -rf %{buildroot}%{_datadir}/doc/geoipupdate +# Install the configuration file +# By default we just use the free GeoIP2 databases +install -d %{buildroot}%{_sysconfdir} +install -p -m 0644 conf/GeoIP.conf.default %{buildroot}%{_sysconfdir}/GeoIP.conf -# Fix up the config file to have geoipupdate fetch the free legacy databases by default -sed -i -e 's/^\(ProductIds\) .*$/\1 506 517 533/' \ - %{buildroot}%{_sysconfdir}/GeoIP.conf +# Ensure the GeoIP data directory exists +# Note: not using %%ghost files for default databases to avoid issues when co-existing with the geolite2 package +install -d %{buildroot}%{_datadir}/GeoIP +# Install the cron script for fetching weekly updates install -D -m 755 %{SOURCE1} %{buildroot}%{_sysconfdir}/cron.weekly/geoipupdate -install -D -m 755 %{SOURCE2} %{buildroot}%{_sysconfdir}/cron.weekly/geoipupdate6 -# Make the download directory for the IPv6 data cron job and some ghost files -mkdir -p %{buildroot}%{_datadir}/GeoIP/download/ -: > %{buildroot}%{_datadir}/GeoIP/download/GeoIPv6.dat.gz -: > %{buildroot}%{_datadir}/GeoIP/download/GeoLiteCityv6.dat.gz -: > %{buildroot}%{_datadir}/GeoIP/download/GeoIPASNumv6.dat.gz +# Install the manpages +install -d %{buildroot}%{_mandir}/man1 +install -p -m 0644 _build/geoipupdate.1 %{buildroot}%{_mandir}/man1/geoipupdate.1 +install -d %{buildroot}%{_mandir}/man5 +install -p -m 0644 _build/GeoIP.conf.5 %{buildroot}%{_mandir}/man5/GeoIP.conf.5 + +%check +export GOPATH=$(pwd)/_build:%{gopath} +cd cmd/geoipupdate +go test +cd - %files -%if 0%{?_licensedir:1} -%license LICENSE -%else -%doc LICENSE -%endif -%doc conf/GeoIP.conf.default README.md ChangeLog.md +%license LICENSE-APACHE LICENSE-MIT +%doc conf/GeoIP.conf.default README.md CHANGELOG.md +%doc doc/GeoIP.conf.md doc/geoipupdate.md Gopkg.lock %config(noreplace) %{_sysconfdir}/GeoIP.conf %{_bindir}/geoipupdate +%dir %{_datadir}/GeoIP/ %{_mandir}/man1/geoipupdate.1* %{_mandir}/man5/GeoIP.conf.5* %files cron %config(noreplace) %{_sysconfdir}/cron.weekly/geoipupdate -%files cron6 -%config(noreplace) %{_sysconfdir}/cron.weekly/geoipupdate6 -%dir %{_datadir}/GeoIP/ -%dir %{_datadir}/GeoIP/download/ -%ghost %{_datadir}/GeoIP/download/GeoIPv6.dat.gz -%ghost %{_datadir}/GeoIP/download/GeoLiteCityv6.dat.gz -%ghost %{_datadir}/GeoIP/download/GeoIPASNumv6.dat.gz - %changelog +* Fri Jan 18 2019 Paul Howarth - 4.0.2-1 +- Update to 4.0.2 + - Completely rewritten in the go language + - New version licensed ASL 2.0 or MIT rather than GPLv2 +- Legacy databases no longer available, so drop/obsolete the cron6 + sub-package + * Tue Sep 11 2018 Paul Howarth - 3.1.1-1 - Update to 3.1.1 - Allow parsing of license keys longer than 12 characters diff --git a/geoipupdate6.cron b/geoipupdate6.cron deleted file mode 100644 index 112d8b8..0000000 --- a/geoipupdate6.cron +++ /dev/null @@ -1,37 +0,0 @@ -#!/usr/bin/perl - -# This script is based on geolite-mirror-simple.pl from Maxmind's Geo::IP perl module - -use strict; -our $VERSION = '0.01'; -use LWP::Simple qw/ mirror RC_NOT_MODIFIED RC_OK $ua /; -use File::Copy qw/ mv /; -use File::Spec; -use PerlIO::gzip; - -# Make sure the directories exist --d ( my $download_dir = '/usr/share/GeoIP/download' ) or die $!; --d ( my $dest_dir = '/usr/share/GeoIP' ) or die $!; - -my %mirror = ( # local-filename geolite-name - 'GeoIPv6.dat.gz' => 'http://geolite.maxmind.com/download/geoip/database/GeoIPv6.dat.gz', - 'GeoLiteCityv6.dat.gz' => 'http://geolite.maxmind.com/download/geoip/database/GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz', - 'GeoIPASNumv6.dat.gz' => 'http://download.maxmind.com/download/geoip/database/asnum/GeoIPASNumv6.dat.gz' -); - -$ua->agent("geoipupdate6.cron/$VERSION"); - -chdir $download_dir or die $!; -for my $f ( keys %mirror ) { - my $rc = mirror( $mirror{$f}, $f ); - next if $rc == RC_NOT_MODIFIED; - if ( $rc == RC_OK ) { - ( my $outfile = $f ) =~ s/\.gz$//; - open my $in, '<:gzip', $f or die $!; - open my $out, '>', $outfile or die $!; - print $out $_ or die $! while <$in>; - mv( $outfile, File::Spec->catfile( $dest_dir, $outfile ) ) or die $!; - } -} -exit 0; - diff --git a/sources b/sources index 94b7d3b..eba083c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (geoipupdate-3.1.1.tar.gz) = 24e6a9f72449df1a2763314f188828332b5516962dbd75892689e505516af967bece60cc846fe17cfcc1ddb4d6111c9cd7d5c0ebc9d3e8e7af355f8a1c7f1a2f +SHA512 (geoipupdate-4.0.2.tar.gz) = 48ce2bf5781f19e470f8f5a8b41e1d3b19ad1dd2c8c0244f8d9f6f64688ffd062ac93506fc3e831556cbe5894c514014176254c666ba78680001dc75f27891b2 From 16e108c3dd55ada58a05a52bdcf420334d371e63 Mon Sep 17 00:00:00 2001 From: Paul Howarth Date: Mon, 21 Jan 2019 12:10:42 +0000 Subject: [PATCH 02/48] Drop free legacy database support Don't try to update the free legacy GeoIP databases as they are no longer distributed by upstream. Drop the cron6 sub-package as the files it tries to download are no longer distributed by upstream. The out-of-the-box configuration is now set up to download the free GeoIP2 databases as used by libmaxminddb. --- geoipupdate.rpmlintrc | 3 +++ geoipupdate.spec | 56 ++++++++++++------------------------------- geoipupdate6.cron | 37 ---------------------------- 3 files changed, 18 insertions(+), 78 deletions(-) delete mode 100644 geoipupdate6.cron diff --git a/geoipupdate.rpmlintrc b/geoipupdate.rpmlintrc index 54539bf..d5305a6 100644 --- a/geoipupdate.rpmlintrc +++ b/geoipupdate.rpmlintrc @@ -6,6 +6,9 @@ addFilter("no-documentation") # Cron scripts can be edited by end users addFilter("executable-marked-as-config-file /etc/cron.weekly/geoipupdate") +# geoipupdate-cron6 is obsolete (upstream stopped providing free IPv6 databases) and not replaced +addFilter("obsolete-not-provided geoipupdate-cron6") + # Technical term addFilter("spelling-error Summary\(en_US\) Cron -> ") addFilter("spelling-error %description -l en_US Cron -> ") diff --git a/geoipupdate.spec b/geoipupdate.spec index 8f60f04..b294018 100644 --- a/geoipupdate.spec +++ b/geoipupdate.spec @@ -2,25 +2,22 @@ Name: geoipupdate Version: 3.1.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Update GeoIP2 and GeoIP Legacy binary databases from MaxMind License: GPLv2 URL: http://dev.maxmind.com/geoip/geoipupdate/ Source0: http://github.com/maxmind/geoipupdate/releases/download/v%{version}/geoipupdate-%{version}.tar.gz Source1: geoipupdate.cron -Source2: geoipupdate6.cron BuildRequires: coreutils +BuildRequires: crontabs BuildRequires: gcc BuildRequires: libcurl-devel BuildRequires: make +BuildRequires: sed BuildRequires: zlib-devel -# Perl modules used by IPv6 cron script -BuildRequires: perl-generators -BuildRequires: perl(File::Copy) -BuildRequires: perl(File::Spec) -BuildRequires: perl(LWP::Simple) -BuildRequires: perl(PerlIO::gzip) -BuildRequires: perl(strict) + +# Legacy databases fetched by cron6 sub-package no longer available +Obsoletes: geoipupdate-cron6 < %{version}-%{release} %description The GeoIP Update program performs automatic updates of GeoIP2 and GeoIP @@ -35,19 +32,8 @@ Obsoletes: GeoIP-update < 1.6.0 Provides: GeoIP-update = 1.6.0 %description cron -Cron job for weekly updates to GeoIP Legacy database from MaxMind. - -%package cron6 -Summary: Cron job to do weekly updates of GeoIP IPv6 databases -BuildArch: noarch -Requires: %{name} = %{version}-%{release} -Requires: crontabs -Requires: wget -Obsoletes: GeoIP-update6 < 1.6.0 -Provides: GeoIP-update6 = 1.6.0 - -%description cron6 -Cron job for weekly updates to GeoIP IPv6 Legacy database from MaxMind. +Cron job for weekly updates to GeoIP2 and GeoIP Legacy binary databases from +MaxMind. %prep %setup -q @@ -62,18 +48,7 @@ make install DESTDIR=%{buildroot} # We'll package the documentation ourselves rm -rf %{buildroot}%{_datadir}/doc/geoipupdate -# Fix up the config file to have geoipupdate fetch the free legacy databases by default -sed -i -e 's/^\(ProductIds\) .*$/\1 506 517 533/' \ - %{buildroot}%{_sysconfdir}/GeoIP.conf - install -D -m 755 %{SOURCE1} %{buildroot}%{_sysconfdir}/cron.weekly/geoipupdate -install -D -m 755 %{SOURCE2} %{buildroot}%{_sysconfdir}/cron.weekly/geoipupdate6 - -# Make the download directory for the IPv6 data cron job and some ghost files -mkdir -p %{buildroot}%{_datadir}/GeoIP/download/ -: > %{buildroot}%{_datadir}/GeoIP/download/GeoIPv6.dat.gz -: > %{buildroot}%{_datadir}/GeoIP/download/GeoLiteCityv6.dat.gz -: > %{buildroot}%{_datadir}/GeoIP/download/GeoIPASNumv6.dat.gz %files %if 0%{?_licensedir:1} @@ -84,21 +59,20 @@ mkdir -p %{buildroot}%{_datadir}/GeoIP/download/ %doc conf/GeoIP.conf.default README.md ChangeLog.md %config(noreplace) %{_sysconfdir}/GeoIP.conf %{_bindir}/geoipupdate +%dir %{_datadir}/GeoIP/ %{_mandir}/man1/geoipupdate.1* %{_mandir}/man5/GeoIP.conf.5* %files cron %config(noreplace) %{_sysconfdir}/cron.weekly/geoipupdate -%files cron6 -%config(noreplace) %{_sysconfdir}/cron.weekly/geoipupdate6 -%dir %{_datadir}/GeoIP/ -%dir %{_datadir}/GeoIP/download/ -%ghost %{_datadir}/GeoIP/download/GeoIPv6.dat.gz -%ghost %{_datadir}/GeoIP/download/GeoLiteCityv6.dat.gz -%ghost %{_datadir}/GeoIP/download/GeoIPASNumv6.dat.gz - %changelog +* Mon Jan 21 2019 Paul Howarth - 3.1.1-2 +- Don't try to update the free legacy GeoIP databases as they are no longer + distributed by upstream +- Drop the cron6 sub-package as the files it tries to download are no longer + distributed by upstream + * Tue Sep 11 2018 Paul Howarth - 3.1.1-1 - Update to 3.1.1 - Allow parsing of license keys longer than 12 characters diff --git a/geoipupdate6.cron b/geoipupdate6.cron deleted file mode 100644 index 112d8b8..0000000 --- a/geoipupdate6.cron +++ /dev/null @@ -1,37 +0,0 @@ -#!/usr/bin/perl - -# This script is based on geolite-mirror-simple.pl from Maxmind's Geo::IP perl module - -use strict; -our $VERSION = '0.01'; -use LWP::Simple qw/ mirror RC_NOT_MODIFIED RC_OK $ua /; -use File::Copy qw/ mv /; -use File::Spec; -use PerlIO::gzip; - -# Make sure the directories exist --d ( my $download_dir = '/usr/share/GeoIP/download' ) or die $!; --d ( my $dest_dir = '/usr/share/GeoIP' ) or die $!; - -my %mirror = ( # local-filename geolite-name - 'GeoIPv6.dat.gz' => 'http://geolite.maxmind.com/download/geoip/database/GeoIPv6.dat.gz', - 'GeoLiteCityv6.dat.gz' => 'http://geolite.maxmind.com/download/geoip/database/GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz', - 'GeoIPASNumv6.dat.gz' => 'http://download.maxmind.com/download/geoip/database/asnum/GeoIPASNumv6.dat.gz' -); - -$ua->agent("geoipupdate6.cron/$VERSION"); - -chdir $download_dir or die $!; -for my $f ( keys %mirror ) { - my $rc = mirror( $mirror{$f}, $f ); - next if $rc == RC_NOT_MODIFIED; - if ( $rc == RC_OK ) { - ( my $outfile = $f ) =~ s/\.gz$//; - open my $in, '<:gzip', $f or die $!; - open my $out, '>', $outfile or die $!; - print $out $_ or die $! while <$in>; - mv( $outfile, File::Spec->catfile( $dest_dir, $outfile ) ) or die $!; - } -} -exit 0; - From 05edf83dfa8a11b28b8ee2becf466f2b73fb14ef Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 20:51:25 +0000 Subject: [PATCH 03/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- geoipupdate.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/geoipupdate.spec b/geoipupdate.spec index 36f9913..9c7e211 100644 --- a/geoipupdate.spec +++ b/geoipupdate.spec @@ -2,7 +2,7 @@ Version: 4.0.2 %forgemeta Name: geoipupdate -Release: 1%{?dist} +Release: 2%{?dist} Summary: Update GeoIP2 and GeoIP Legacy binary databases from MaxMind License: ASL 2.0 or MIT URL: http://dev.maxmind.com/geoip/geoipupdate/ @@ -113,6 +113,9 @@ cd - %config(noreplace) %{_sysconfdir}/cron.weekly/geoipupdate %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 4.0.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Jan 18 2019 Paul Howarth - 4.0.2-1 - Update to 4.0.2 - Completely rewritten in the go language From fc0d813fbb81d79b098106a7547e2913a9378056 Mon Sep 17 00:00:00 2001 From: Paul Howarth Date: Mon, 10 Jun 2019 19:59:08 +0100 Subject: [PATCH 04/48] Update to 4.0.3 - New upstream release 4.0.3 - Update flock dependency from 'theckman/go-flock' to 'gofrs/flock' (GH#22) - Switch to Go modules and update dependencies - Fix version output on Ubuntu PPA and Homebrew releases - Revert switch to Go Modules as our tooling isn't ready for that yet --- .gitignore | 1 + geoipupdate-4.0.1-flock.patch | 94 ---------------- geoipupdate-4.0.3-go-modules.patch | 172 +++++++++++++++++++++++++++++ geoipupdate.spec | 18 ++- sources | 2 +- 5 files changed, 186 insertions(+), 101 deletions(-) delete mode 100644 geoipupdate-4.0.1-flock.patch create mode 100644 geoipupdate-4.0.3-go-modules.patch diff --git a/.gitignore b/.gitignore index f4a606c..eeab5e0 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /geoipupdate-3.1.0.tar.gz /geoipupdate-3.1.1.tar.gz /geoipupdate-4.0.2.tar.gz +/geoipupdate-4.0.3.tar.gz diff --git a/geoipupdate-4.0.1-flock.patch b/geoipupdate-4.0.1-flock.patch deleted file mode 100644 index 84b0dc1..0000000 --- a/geoipupdate-4.0.1-flock.patch +++ /dev/null @@ -1,94 +0,0 @@ - - * github.com/theckman/go-flock renamed to github.com/gofrs/flock - * flock.NewFlock deprecated: use flock.New instead - -diff --git a/Gopkg.lock b/Gopkg.lock -index 82255c3..47d965c 100644 ---- a/Gopkg.lock -+++ b/Gopkg.lock -@@ -9,6 +9,14 @@ - revision = "346938d642f2ec3594ed81d874461961cd0faa76" - version = "v1.1.0" - -+[[projects]] -+ digest = "1:70f34ee6d1b188cbd2dfcde62b0e2c600262eb5a03c8a3f3435ecf7c74790470" -+ name = "github.com/gofrs/flock" -+ packages = ["."] -+ pruneopts = "UT" -+ revision = "7f43ea2e6a643ad441fc12d0ecc0d3388b300c53" -+ version = "v0.7.0" -+ - [[projects]] - digest = "1:40e195917a951a8bf867cd05de2a46aaf1806c50cf92eebf4c16f78cd196f747" - name = "github.com/pkg/errors" -@@ -34,7 +42,7 @@ - version = "v1.0.1" - - [[projects]] -- digest = "1:befd7181c2f92c9f05abf17cd7e15538919f19cf7871d794cacc45a4fb99c135" -+ digest = "1:c40d65817cdd41fac9aa7af8bed56927bb2d6d47e4fea566a74880f5c2b1c41e" - name = "github.com/stretchr/testify" - packages = [ - "assert", -@@ -44,23 +52,15 @@ - revision = "f35b8ab0b5a2cef36673838d662e249dd9c94686" - version = "v1.2.2" - --[[projects]] -- digest = "1:e5abcb5d4f4cec8b475f2a812a00c3218fb75f0f792cdeee301e265d22a98cb7" -- name = "github.com/theckman/go-flock" -- packages = ["."] -- pruneopts = "UT" -- revision = "b139a2487364247d91814e4a7c7b8fdc69e342b2" -- version = "v0.4.0" -- - [solve-meta] - analyzer-name = "dep" - analyzer-version = 1 - input-imports = [ -+ "github.com/gofrs/flock", - "github.com/pkg/errors", - "github.com/spf13/pflag", - "github.com/stretchr/testify/assert", - "github.com/stretchr/testify/require", -- "github.com/theckman/go-flock", - ] - solver-name = "gps-cdcl" - solver-version = 1 -diff --git a/Gopkg.toml b/Gopkg.toml -index 0d37060..59fa533 100644 ---- a/Gopkg.toml -+++ b/Gopkg.toml -@@ -34,8 +34,8 @@ - version = "1.2.2" - - [[constraint]] -- name = "github.com/theckman/go-flock" -- version = "0.4.0" -+ name = "github.com/gofrs/flock" -+ version = "0.7.0" - - [prune] - go-tests = true -diff --git a/cmd/geoipupdate/main.go b/cmd/geoipupdate/main.go -index 6693ea6..59932b4 100644 ---- a/cmd/geoipupdate/main.go -+++ b/cmd/geoipupdate/main.go -@@ -16,7 +16,7 @@ import ( - "time" - - "github.com/pkg/errors" -- flock "github.com/theckman/go-flock" -+ "github.com/gofrs/flock" - ) - - // version is the program's version number. -@@ -76,7 +76,7 @@ func setup( - return nil, err - } - -- lock := flock.NewFlock(config.LockFile) -+ lock := flock.New(config.LockFile) - ok, err := lock.TryLock() - if err != nil { - return nil, errors.Wrap(err, "error acquiring a lock") diff --git a/geoipupdate-4.0.3-go-modules.patch b/geoipupdate-4.0.3-go-modules.patch new file mode 100644 index 0000000..b90c28b --- /dev/null +++ b/geoipupdate-4.0.3-go-modules.patch @@ -0,0 +1,172 @@ +commit d1dacd72c8171f97dc641f73a38e1608b1c5ab46 +Author: Gregory Oschwald +Date: Wed Jun 5 15:23:23 2019 -0700 + + Switch from dep to Go modules + +diff --git a/Gopkg.lock b/Gopkg.lock +deleted file mode 100644 +index 47d965c..0000000 +--- a/Gopkg.lock ++++ /dev/null +@@ -1,66 +0,0 @@ +-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'. +- +- +-[[projects]] +- digest = "1:a2c1d0e43bd3baaa071d1b9ed72c27d78169b2b269f71c105ac4ba34b1be4a39" +- name = "github.com/davecgh/go-spew" +- packages = ["spew"] +- pruneopts = "UT" +- revision = "346938d642f2ec3594ed81d874461961cd0faa76" +- version = "v1.1.0" +- +-[[projects]] +- digest = "1:70f34ee6d1b188cbd2dfcde62b0e2c600262eb5a03c8a3f3435ecf7c74790470" +- name = "github.com/gofrs/flock" +- packages = ["."] +- pruneopts = "UT" +- revision = "7f43ea2e6a643ad441fc12d0ecc0d3388b300c53" +- version = "v0.7.0" +- +-[[projects]] +- digest = "1:40e195917a951a8bf867cd05de2a46aaf1806c50cf92eebf4c16f78cd196f747" +- name = "github.com/pkg/errors" +- packages = ["."] +- pruneopts = "UT" +- revision = "645ef00459ed84a119197bfb8d8205042c6df63d" +- version = "v0.8.0" +- +-[[projects]] +- digest = "1:0028cb19b2e4c3112225cd871870f2d9cf49b9b4276531f03438a88e94be86fe" +- name = "github.com/pmezard/go-difflib" +- packages = ["difflib"] +- pruneopts = "UT" +- revision = "792786c7400a136282c1664665ae0a8db921c6c2" +- version = "v1.0.0" +- +-[[projects]] +- digest = "1:9424f440bba8f7508b69414634aef3b2b3a877e522d8a4624692412805407bb7" +- name = "github.com/spf13/pflag" +- packages = ["."] +- pruneopts = "UT" +- revision = "583c0c0531f06d5278b7d917446061adc344b5cd" +- version = "v1.0.1" +- +-[[projects]] +- digest = "1:c40d65817cdd41fac9aa7af8bed56927bb2d6d47e4fea566a74880f5c2b1c41e" +- name = "github.com/stretchr/testify" +- packages = [ +- "assert", +- "require", +- ] +- pruneopts = "UT" +- revision = "f35b8ab0b5a2cef36673838d662e249dd9c94686" +- version = "v1.2.2" +- +-[solve-meta] +- analyzer-name = "dep" +- analyzer-version = 1 +- input-imports = [ +- "github.com/gofrs/flock", +- "github.com/pkg/errors", +- "github.com/spf13/pflag", +- "github.com/stretchr/testify/assert", +- "github.com/stretchr/testify/require", +- ] +- solver-name = "gps-cdcl" +- solver-version = 1 +diff --git a/Gopkg.toml b/Gopkg.toml +deleted file mode 100644 +index 59fa533..0000000 +--- a/Gopkg.toml ++++ /dev/null +@@ -1,42 +0,0 @@ +-# Gopkg.toml example +-# +-# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md +-# for detailed Gopkg.toml documentation. +-# +-# required = ["github.com/user/thing/cmd/thing"] +-# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"] +-# +-# [[constraint]] +-# name = "github.com/user/project" +-# version = "1.0.0" +-# +-# [[constraint]] +-# name = "github.com/user/project2" +-# branch = "dev" +-# source = "github.com/myfork/project2" +-# +-# [[override]] +-# name = "github.com/x/y" +-# version = "2.4.0" +-# +-# [prune] +-# non-go = false +-# go-tests = true +-# unused-packages = true +- +- +-[[constraint]] +- name = "github.com/pkg/errors" +- version = "0.8.0" +- +-[[constraint]] +- name = "github.com/stretchr/testify" +- version = "1.2.2" +- +-[[constraint]] +- name = "github.com/gofrs/flock" +- version = "0.7.0" +- +-[prune] +- go-tests = true +- unused-packages = true +diff --git a/go.mod b/go.mod +new file mode 100644 +index 0000000..e2a7347 +--- /dev/null ++++ b/go.mod +@@ -0,0 +1,13 @@ ++module github.com/maxmind/geoipupdate ++ ++go 1.12 ++ ++require ( ++ github.com/davecgh/go-spew v1.1.1 // indirect ++ github.com/gofrs/flock v0.7.1 ++ github.com/kr/pretty v0.1.0 // indirect ++ github.com/pkg/errors v0.8.1 ++ github.com/spf13/pflag v1.0.3 ++ github.com/stretchr/testify v1.3.0 ++ gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect ++) +diff --git a/go.sum b/go.sum +new file mode 100644 +index 0000000..aaa33eb +--- /dev/null ++++ b/go.sum +@@ -0,0 +1,21 @@ ++github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= ++github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= ++github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= ++github.com/gofrs/flock v0.7.1 h1:DP+LD/t0njgoPBvT5MJLeliUIVQR03hiKR6vezdwHlc= ++github.com/gofrs/flock v0.7.1/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= ++github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= ++github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= ++github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= ++github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= ++github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= ++github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= ++github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= ++github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= ++github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= ++github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg= ++github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= ++github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= ++github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q= ++github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= ++gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= ++gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/geoipupdate.spec b/geoipupdate.spec index 9c7e211..9edfb6f 100644 --- a/geoipupdate.spec +++ b/geoipupdate.spec @@ -1,14 +1,14 @@ %global forgeurl https://github.com/maxmind/geoipupdate -Version: 4.0.2 +Version: 4.0.3 %forgemeta Name: geoipupdate -Release: 2%{?dist} +Release: 1%{?dist} Summary: Update GeoIP2 and GeoIP Legacy binary databases from MaxMind License: ASL 2.0 or MIT URL: http://dev.maxmind.com/geoip/geoipupdate/ Source0: %{forgesource} Source1: geoipupdate.cron -Patch0: geoipupdate-4.0.1-flock.patch +Patch0: geoipupdate-4.0.3-go-modules.patch ExclusiveArch: %{go_arches} BuildRequires: compiler(go-compiler) BuildRequires: coreutils @@ -48,9 +48,8 @@ MaxMind. # Remove bundled dependencies rm -rf vendor/ -# go-flock renamed upstream and new API preferred -# https://github.com/maxmind/geoipupdate/pull/22 -%patch0 -p1 +# Revert switch to Go Modules as our tooling isn't ready for that yet +%patch0 -p1 -R %build # Set up temporary build gopath and put our directory there @@ -113,6 +112,13 @@ cd - %config(noreplace) %{_sysconfdir}/cron.weekly/geoipupdate %changelog +* Mon Jun 10 2019 Paul Howarth - 4.0.3-1 +- Update to 4.0.3 + - Update flock dependency from 'theckman/go-flock' to 'gofrs/flock' (GH#22) + - Switch to Go modules and update dependencies + - Fix version output on Ubuntu PPA and Homebrew releases +- Revert switch to Go Modules as our tooling isn't ready for that yet + * Thu Jan 31 2019 Fedora Release Engineering - 4.0.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index eba083c..097c04c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (geoipupdate-4.0.2.tar.gz) = 48ce2bf5781f19e470f8f5a8b41e1d3b19ad1dd2c8c0244f8d9f6f64688ffd062ac93506fc3e831556cbe5894c514014176254c666ba78680001dc75f27891b2 +SHA512 (geoipupdate-4.0.3.tar.gz) = 870f930a54a45f5fe14c8328158ea2c8d2d8e4320a5400abc8ec18ae1e234426e86492a41868ccd3bf649acf0cd347722683326817359fed7d147ab21eb64397 From 31b7c702fb0d4ea7152d16e7b9dad73f5192108e Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sat, 13 Jul 2019 01:51:24 -0400 Subject: [PATCH 05/48] Update to latest Go macros. --- geoipupdate-4.0.3-go-modules.patch | 172 ----------------------------- geoipupdate.spec | 65 ++++++----- 2 files changed, 31 insertions(+), 206 deletions(-) delete mode 100644 geoipupdate-4.0.3-go-modules.patch diff --git a/geoipupdate-4.0.3-go-modules.patch b/geoipupdate-4.0.3-go-modules.patch deleted file mode 100644 index b90c28b..0000000 --- a/geoipupdate-4.0.3-go-modules.patch +++ /dev/null @@ -1,172 +0,0 @@ -commit d1dacd72c8171f97dc641f73a38e1608b1c5ab46 -Author: Gregory Oschwald -Date: Wed Jun 5 15:23:23 2019 -0700 - - Switch from dep to Go modules - -diff --git a/Gopkg.lock b/Gopkg.lock -deleted file mode 100644 -index 47d965c..0000000 ---- a/Gopkg.lock -+++ /dev/null -@@ -1,66 +0,0 @@ --# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'. -- -- --[[projects]] -- digest = "1:a2c1d0e43bd3baaa071d1b9ed72c27d78169b2b269f71c105ac4ba34b1be4a39" -- name = "github.com/davecgh/go-spew" -- packages = ["spew"] -- pruneopts = "UT" -- revision = "346938d642f2ec3594ed81d874461961cd0faa76" -- version = "v1.1.0" -- --[[projects]] -- digest = "1:70f34ee6d1b188cbd2dfcde62b0e2c600262eb5a03c8a3f3435ecf7c74790470" -- name = "github.com/gofrs/flock" -- packages = ["."] -- pruneopts = "UT" -- revision = "7f43ea2e6a643ad441fc12d0ecc0d3388b300c53" -- version = "v0.7.0" -- --[[projects]] -- digest = "1:40e195917a951a8bf867cd05de2a46aaf1806c50cf92eebf4c16f78cd196f747" -- name = "github.com/pkg/errors" -- packages = ["."] -- pruneopts = "UT" -- revision = "645ef00459ed84a119197bfb8d8205042c6df63d" -- version = "v0.8.0" -- --[[projects]] -- digest = "1:0028cb19b2e4c3112225cd871870f2d9cf49b9b4276531f03438a88e94be86fe" -- name = "github.com/pmezard/go-difflib" -- packages = ["difflib"] -- pruneopts = "UT" -- revision = "792786c7400a136282c1664665ae0a8db921c6c2" -- version = "v1.0.0" -- --[[projects]] -- digest = "1:9424f440bba8f7508b69414634aef3b2b3a877e522d8a4624692412805407bb7" -- name = "github.com/spf13/pflag" -- packages = ["."] -- pruneopts = "UT" -- revision = "583c0c0531f06d5278b7d917446061adc344b5cd" -- version = "v1.0.1" -- --[[projects]] -- digest = "1:c40d65817cdd41fac9aa7af8bed56927bb2d6d47e4fea566a74880f5c2b1c41e" -- name = "github.com/stretchr/testify" -- packages = [ -- "assert", -- "require", -- ] -- pruneopts = "UT" -- revision = "f35b8ab0b5a2cef36673838d662e249dd9c94686" -- version = "v1.2.2" -- --[solve-meta] -- analyzer-name = "dep" -- analyzer-version = 1 -- input-imports = [ -- "github.com/gofrs/flock", -- "github.com/pkg/errors", -- "github.com/spf13/pflag", -- "github.com/stretchr/testify/assert", -- "github.com/stretchr/testify/require", -- ] -- solver-name = "gps-cdcl" -- solver-version = 1 -diff --git a/Gopkg.toml b/Gopkg.toml -deleted file mode 100644 -index 59fa533..0000000 ---- a/Gopkg.toml -+++ /dev/null -@@ -1,42 +0,0 @@ --# Gopkg.toml example --# --# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md --# for detailed Gopkg.toml documentation. --# --# required = ["github.com/user/thing/cmd/thing"] --# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"] --# --# [[constraint]] --# name = "github.com/user/project" --# version = "1.0.0" --# --# [[constraint]] --# name = "github.com/user/project2" --# branch = "dev" --# source = "github.com/myfork/project2" --# --# [[override]] --# name = "github.com/x/y" --# version = "2.4.0" --# --# [prune] --# non-go = false --# go-tests = true --# unused-packages = true -- -- --[[constraint]] -- name = "github.com/pkg/errors" -- version = "0.8.0" -- --[[constraint]] -- name = "github.com/stretchr/testify" -- version = "1.2.2" -- --[[constraint]] -- name = "github.com/gofrs/flock" -- version = "0.7.0" -- --[prune] -- go-tests = true -- unused-packages = true -diff --git a/go.mod b/go.mod -new file mode 100644 -index 0000000..e2a7347 ---- /dev/null -+++ b/go.mod -@@ -0,0 +1,13 @@ -+module github.com/maxmind/geoipupdate -+ -+go 1.12 -+ -+require ( -+ github.com/davecgh/go-spew v1.1.1 // indirect -+ github.com/gofrs/flock v0.7.1 -+ github.com/kr/pretty v0.1.0 // indirect -+ github.com/pkg/errors v0.8.1 -+ github.com/spf13/pflag v1.0.3 -+ github.com/stretchr/testify v1.3.0 -+ gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect -+) -diff --git a/go.sum b/go.sum -new file mode 100644 -index 0000000..aaa33eb ---- /dev/null -+++ b/go.sum -@@ -0,0 +1,21 @@ -+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= -+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -+github.com/gofrs/flock v0.7.1 h1:DP+LD/t0njgoPBvT5MJLeliUIVQR03hiKR6vezdwHlc= -+github.com/gofrs/flock v0.7.1/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= -+github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= -+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -+github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= -+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -+github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= -+github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= -+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -+github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg= -+github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= -+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -+github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q= -+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= -+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/geoipupdate.spec b/geoipupdate.spec index 9edfb6f..75c1c5b 100644 --- a/geoipupdate.spec +++ b/geoipupdate.spec @@ -1,22 +1,25 @@ -%global forgeurl https://github.com/maxmind/geoipupdate +%bcond_without check + +# https://github.com/maxmind/geoipupdate +%global goipath github.com/maxmind/geoipupdate Version: 4.0.3 -%forgemeta + +%gometa + Name: geoipupdate -Release: 1%{?dist} +Release: 2%{?dist} Summary: Update GeoIP2 and GeoIP Legacy binary databases from MaxMind + License: ASL 2.0 or MIT URL: http://dev.maxmind.com/geoip/geoipupdate/ -Source0: %{forgesource} +Source0: %{gosource} Source1: geoipupdate.cron -Patch0: geoipupdate-4.0.3-go-modules.patch -ExclusiveArch: %{go_arches} -BuildRequires: compiler(go-compiler) + BuildRequires: coreutils BuildRequires: crontabs +BuildRequires: golang(github.com/gofrs/flock) BuildRequires: golang(github.com/pkg/errors) BuildRequires: golang(github.com/spf13/pflag) -BuildRequires: golang(github.com/stretchr/testify) -BuildRequires: golang(github.com/gofrs/flock) BuildRequires: make BuildRequires: pandoc BuildRequires: perl-interpreter @@ -26,6 +29,12 @@ BuildRequires: sed # Legacy databases fetched by cron6 sub-package no longer available Obsoletes: geoipupdate-cron6 < %{version}-%{release} +%if %{with check} +# Tests +BuildRequires: golang(github.com/stretchr/testify/assert) +BuildRequires: golang(github.com/stretchr/testify/require) +%endif + %description The GeoIP Update program performs automatic updates of GeoIP2 and GeoIP Legacy binary databases. @@ -43,36 +52,22 @@ Cron job for weekly updates to GeoIP2 and GeoIP Legacy binary databases from MaxMind. %prep -%forgesetup - -# Remove bundled dependencies -rm -rf vendor/ - -# Revert switch to Go Modules as our tooling isn't ready for that yet -%patch0 -p1 -R +%goprep %build -# Set up temporary build gopath and put our directory there -mkdir -p ./_build/src/github.com/maxmind -ln -s $(pwd) ./_build/src/github.com/maxmind/geoipupdate -export GOPATH=$(pwd)/_build:%{gopath} - -# Make the geoipupdate program -cd cmd/geoipupdate -export LDFLAGS='-X main.defaultConfigFile=%{_sysconfdir}/GeoIP.conf -X main.defaultDatabaseDirectory=%{_datadir}/GeoIP' -%gobuild -cd - +export LDFLAGS='-X main.defaultConfigFile=%{_sysconfdir}/GeoIP.conf -X main.defaultDatabaseDirectory=%{_datadir}/GeoIP ' +%gobuild -o %{gobuilddir}/bin/geoipupdate %{goipath}/cmd/geoipupdate # Work around hardcoded "build" path in dev-bin/make-man-pages.pl -ln -s _build build +ln -s %{gobuilddir} build # Prepare the config files and documentation -make BUILDDIR=$(pwd)/_build CONFFILE=%{_sysconfdir}/GeoIP.conf DATADIR=%{_datadir}/GeoIP data +make BUILDDIR=%{gobuilddir} CONFFILE=%{_sysconfdir}/GeoIP.conf DATADIR=%{_datadir}/GeoIP data %install # Install the geoipupdate program install -d %{buildroot}%{_bindir} -install -p -m 0755 cmd/geoipupdate/geoipupdate %{buildroot}%{_bindir}/geoipupdate +install -p -m 0755 %{gobuilddir}/bin/geoipupdate %{buildroot}%{_bindir}/geoipupdate # Install the configuration file # By default we just use the free GeoIP2 databases @@ -92,16 +87,15 @@ install -p -m 0644 _build/geoipupdate.1 %{buildroot}%{_mandir}/man1/geoipupdate. install -d %{buildroot}%{_mandir}/man5 install -p -m 0644 _build/GeoIP.conf.5 %{buildroot}%{_mandir}/man5/GeoIP.conf.5 +%if %{with check} %check -export GOPATH=$(pwd)/_build:%{gopath} -cd cmd/geoipupdate -go test -cd - +%gocheck +%endif %files %license LICENSE-APACHE LICENSE-MIT %doc conf/GeoIP.conf.default README.md CHANGELOG.md -%doc doc/GeoIP.conf.md doc/geoipupdate.md Gopkg.lock +%doc doc/GeoIP.conf.md doc/geoipupdate.md %config(noreplace) %{_sysconfdir}/GeoIP.conf %{_bindir}/geoipupdate %dir %{_datadir}/GeoIP/ @@ -112,6 +106,9 @@ cd - %config(noreplace) %{_sysconfdir}/cron.weekly/geoipupdate %changelog +* Fri Jul 12 2019 Elliott Sales de Andrade - 4.0.3-2 +- Update to latest Go macros + * Mon Jun 10 2019 Paul Howarth - 4.0.3-1 - Update to 4.0.3 - Update flock dependency from 'theckman/go-flock' to 'gofrs/flock' (GH#22) From cb8e54db9dd397dd92bc9018f440701bf13e9778 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 01:46:38 +0000 Subject: [PATCH 06/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- geoipupdate.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/geoipupdate.spec b/geoipupdate.spec index 75c1c5b..16d650c 100644 --- a/geoipupdate.spec +++ b/geoipupdate.spec @@ -7,7 +7,7 @@ Version: 4.0.3 %gometa Name: geoipupdate -Release: 2%{?dist} +Release: 3%{?dist} Summary: Update GeoIP2 and GeoIP Legacy binary databases from MaxMind License: ASL 2.0 or MIT @@ -106,6 +106,9 @@ install -p -m 0644 _build/GeoIP.conf.5 %{buildroot}%{_mandir}/man5/GeoIP.conf.5 %config(noreplace) %{_sysconfdir}/cron.weekly/geoipupdate %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 4.0.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri Jul 12 2019 Elliott Sales de Andrade - 4.0.3-2 - Update to latest Go macros From 34f862e64722e45af8d7aacdf84347aecfb0f8e4 Mon Sep 17 00:00:00 2001 From: Paul Howarth Date: Sun, 1 Sep 2019 15:02:19 +0100 Subject: [PATCH 07/48] Update to 4.0.4 - New upstream release 4.0.4 - Do not try to sync the database directory when running on Windows; syncing this way is not supported there and would lead to an error (GH#32) --- .gitignore | 1 + geoipupdate.spec | 9 +++++++-- sources | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index eeab5e0..fddcd22 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /geoipupdate-3.1.1.tar.gz /geoipupdate-4.0.2.tar.gz /geoipupdate-4.0.3.tar.gz +/geoipupdate-4.0.4.tar.gz diff --git a/geoipupdate.spec b/geoipupdate.spec index 16d650c..f2a513f 100644 --- a/geoipupdate.spec +++ b/geoipupdate.spec @@ -2,12 +2,12 @@ # https://github.com/maxmind/geoipupdate %global goipath github.com/maxmind/geoipupdate -Version: 4.0.3 +Version: 4.0.4 %gometa Name: geoipupdate -Release: 3%{?dist} +Release: 1%{?dist} Summary: Update GeoIP2 and GeoIP Legacy binary databases from MaxMind License: ASL 2.0 or MIT @@ -106,6 +106,11 @@ install -p -m 0644 _build/GeoIP.conf.5 %{buildroot}%{_mandir}/man5/GeoIP.conf.5 %config(noreplace) %{_sysconfdir}/cron.weekly/geoipupdate %changelog +* Sun Sep 1 2019 Paul Howarth - 4.0.4-1 +- Update to 4.0.4 + - Do not try to sync the database directory when running on Windows; syncing + this way is not supported there and would lead to an error (GH#32) + * Thu Jul 25 2019 Fedora Release Engineering - 4.0.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 097c04c..9270f29 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (geoipupdate-4.0.3.tar.gz) = 870f930a54a45f5fe14c8328158ea2c8d2d8e4320a5400abc8ec18ae1e234426e86492a41868ccd3bf649acf0cd347722683326817359fed7d147ab21eb64397 +SHA512 (geoipupdate-4.0.4.tar.gz) = 2d97f65128d26600345b07cab4b1c1ed26f68bb850f4fa92d8f6b4065d1e9a25b73b38e1cc08bc0afc11135394fe20fb77bd931e557ba6fe83d792ad3bcc4a1c From fce6705236a7820a7504eff3382c7f41b01a5f17 Mon Sep 17 00:00:00 2001 From: Paul Howarth Date: Sat, 14 Sep 2019 15:32:07 +0100 Subject: [PATCH 08/48] Update to 4.0.6 - New upstream release 4.0.6 - Ignore errors when syncing file system: these errors were primarily due to the file system not supporting the sync call (GH#37) - Use CRLF line endings on Windows for text files - Fix tests on Windows - Improve man page formatting (GH#38) - Dependencies are no longer vendored (GH#39) --- .gitignore | 1 + geoipupdate.spec | 12 +++++++++++- sources | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index fddcd22..1463995 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /geoipupdate-4.0.2.tar.gz /geoipupdate-4.0.3.tar.gz /geoipupdate-4.0.4.tar.gz +/geoipupdate-4.0.6.tar.gz diff --git a/geoipupdate.spec b/geoipupdate.spec index f2a513f..fafbf3b 100644 --- a/geoipupdate.spec +++ b/geoipupdate.spec @@ -2,7 +2,7 @@ # https://github.com/maxmind/geoipupdate %global goipath github.com/maxmind/geoipupdate -Version: 4.0.4 +Version: 4.0.6 %gometa @@ -23,6 +23,7 @@ BuildRequires: golang(github.com/spf13/pflag) BuildRequires: make BuildRequires: pandoc BuildRequires: perl-interpreter +BuildRequires: perl(File::Temp) BuildRequires: perl(strict) BuildRequires: perl(warnings) BuildRequires: sed @@ -106,6 +107,15 @@ install -p -m 0644 _build/GeoIP.conf.5 %{buildroot}%{_mandir}/man5/GeoIP.conf.5 %config(noreplace) %{_sysconfdir}/cron.weekly/geoipupdate %changelog +* Sat Sep 14 2019 Paul Howarth - 4.0.6-1 +- Update to 4.0.6 + - Ignore errors when syncing file system: these errors were primarily due to + the file system not supporting the sync call (GH#37) + - Use CRLF line endings on Windows for text files + - Fix tests on Windows + - Improve man page formatting (GH#38) + - Dependencies are no longer vendored (GH#39) + * Sun Sep 1 2019 Paul Howarth - 4.0.4-1 - Update to 4.0.4 - Do not try to sync the database directory when running on Windows; syncing diff --git a/sources b/sources index 9270f29..25087d8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (geoipupdate-4.0.4.tar.gz) = 2d97f65128d26600345b07cab4b1c1ed26f68bb850f4fa92d8f6b4065d1e9a25b73b38e1cc08bc0afc11135394fe20fb77bd931e557ba6fe83d792ad3bcc4a1c +SHA512 (geoipupdate-4.0.6.tar.gz) = 41b011a1b21799b2bd6f32762de8c5ddd1026f24d9f3d7f2efbae78f637021a6d657d824ee7079cecd6f032de0a3ed92d983c2f2bbb65a7605143c1b75b12b8c From f39a876d59211571e95e3698b64702b0570698a2 Mon Sep 17 00:00:00 2001 From: Paul Howarth Date: Fri, 8 Nov 2019 13:07:30 +0000 Subject: [PATCH 09/48] Update to 4.1.4 - New upstream release 4.1.4 - Improve man page formatting and organization (GH#44) - Provide update functionality as an importable package as well as a standalone program (GH#48) - Remove formatting, linting, and testing from the geoipupdate target in the Makefile --- .gitignore | 1 + geoipupdate.spec | 10 +++++++++- sources | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 1463995..a736c32 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /geoipupdate-4.0.3.tar.gz /geoipupdate-4.0.4.tar.gz /geoipupdate-4.0.6.tar.gz +/geoipupdate-4.1.4.tar.gz diff --git a/geoipupdate.spec b/geoipupdate.spec index fafbf3b..02ca55f 100644 --- a/geoipupdate.spec +++ b/geoipupdate.spec @@ -2,7 +2,7 @@ # https://github.com/maxmind/geoipupdate %global goipath github.com/maxmind/geoipupdate -Version: 4.0.6 +Version: 4.1.4 %gometa @@ -107,6 +107,14 @@ install -p -m 0644 _build/GeoIP.conf.5 %{buildroot}%{_mandir}/man5/GeoIP.conf.5 %config(noreplace) %{_sysconfdir}/cron.weekly/geoipupdate %changelog +* Fri Nov 8 2019 Paul Howarth - 4.1.4-1 +- Update to 4.1.4 + - Improve man page formatting and organization (GH#44) + - Provide update functionality as an importable package as well as a + standalone program (GH#48) + - Remove formatting, linting, and testing from the geoipupdate target in the + Makefile + * Sat Sep 14 2019 Paul Howarth - 4.0.6-1 - Update to 4.0.6 - Ignore errors when syncing file system: these errors were primarily due to diff --git a/sources b/sources index 25087d8..1d12d10 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (geoipupdate-4.0.6.tar.gz) = 41b011a1b21799b2bd6f32762de8c5ddd1026f24d9f3d7f2efbae78f637021a6d657d824ee7079cecd6f032de0a3ed92d983c2f2bbb65a7605143c1b75b12b8c +SHA512 (geoipupdate-4.1.4.tar.gz) = 9084051a6012e77cba6c43aa7d88d4f93c7a3c45d6f6a634e2782598d17d87ad38db9aa0b41af29b16444c164c24b1de93d9618da528478d115ba8ad38a734b8 From ed11ffa9d3df0beb88ab23a0e98b6b631b1287af Mon Sep 17 00:00:00 2001 From: Paul Howarth Date: Sun, 10 Nov 2019 11:33:49 +0000 Subject: [PATCH 10/48] Update to 4.1.5 - New uostream release 4.1.5 - Respect the defaultConfigFile and defaultDatabaseDirectory variables in the main package again; they were ignored in 4.1.0 through 4.1.4 (if not specified, the GitHub and PPA releases for these versions used the config /usr/local/etc/GeoIP.conf instead of /etc/GeoIP.conf and the database directory /usr/local/share/GeoIP instead of /usr/share/GeoIP) --- .gitignore | 1 + geoipupdate.spec | 10 +++++++++- sources | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index a736c32..867f78a 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /geoipupdate-4.0.4.tar.gz /geoipupdate-4.0.6.tar.gz /geoipupdate-4.1.4.tar.gz +/geoipupdate-4.1.5.tar.gz diff --git a/geoipupdate.spec b/geoipupdate.spec index 02ca55f..d99522d 100644 --- a/geoipupdate.spec +++ b/geoipupdate.spec @@ -2,7 +2,7 @@ # https://github.com/maxmind/geoipupdate %global goipath github.com/maxmind/geoipupdate -Version: 4.1.4 +Version: 4.1.5 %gometa @@ -107,6 +107,14 @@ install -p -m 0644 _build/GeoIP.conf.5 %{buildroot}%{_mandir}/man5/GeoIP.conf.5 %config(noreplace) %{_sysconfdir}/cron.weekly/geoipupdate %changelog +* Sun Nov 10 2019 Paul Howarth - 4.1.5-1 +- Update to 4.1.5 + - Respect the defaultConfigFile and defaultDatabaseDirectory variables in the + main package again; they were ignored in 4.1.0 through 4.1.4 (if not + specified, the GitHub and PPA releases for these versions used the config + /usr/local/etc/GeoIP.conf instead of /etc/GeoIP.conf and the database + directory /usr/local/share/GeoIP instead of /usr/share/GeoIP) + * Fri Nov 8 2019 Paul Howarth - 4.1.4-1 - Update to 4.1.4 - Improve man page formatting and organization (GH#44) diff --git a/sources b/sources index 1d12d10..881b062 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (geoipupdate-4.1.4.tar.gz) = 9084051a6012e77cba6c43aa7d88d4f93c7a3c45d6f6a634e2782598d17d87ad38db9aa0b41af29b16444c164c24b1de93d9618da528478d115ba8ad38a734b8 +SHA512 (geoipupdate-4.1.5.tar.gz) = be0dc0b4c5231b8dc3122043742081f5cb753ed12fc8757de23e5016b45f6eb6c104365fc509ae78fc1e7be2ef698d38b7a2558ebcc6e2ba6c4aabc51244405e From a4d9866f609b2d60ece8d6dce48ee5dab5042335 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 19:54:45 +0000 Subject: [PATCH 11/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- geoipupdate.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/geoipupdate.spec b/geoipupdate.spec index d99522d..2b735df 100644 --- a/geoipupdate.spec +++ b/geoipupdate.spec @@ -7,7 +7,7 @@ Version: 4.1.5 %gometa Name: geoipupdate -Release: 1%{?dist} +Release: 2%{?dist} Summary: Update GeoIP2 and GeoIP Legacy binary databases from MaxMind License: ASL 2.0 or MIT @@ -107,6 +107,9 @@ install -p -m 0644 _build/GeoIP.conf.5 %{buildroot}%{_mandir}/man5/GeoIP.conf.5 %config(noreplace) %{_sysconfdir}/cron.weekly/geoipupdate %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 4.1.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sun Nov 10 2019 Paul Howarth - 4.1.5-1 - Update to 4.1.5 - Respect the defaultConfigFile and defaultDatabaseDirectory variables in the From 0121d95bc5f478e12fa5a65147ddc9d2b9554c5b Mon Sep 17 00:00:00 2001 From: Paul Howarth Date: Mon, 24 Feb 2020 15:39:51 +0000 Subject: [PATCH 12/48] Update to 4.2.2 - New upstream release 4.2.2 - The major version of the module is now included at the end of the module path; previously, it was not possible to import the module in projects that were using Go modules (GH#81) - A valid account ID and license key combination is now required for database downloads, so those configuration options are now required - The error handling when closing a local database file would previously ignore errors and, upon upgrading to 'github.com/pkg/errors' 0.9.0, would fail to ignore expected errors (GH#69, GH#70) - The RPM release was previously lacking the correct owner and group on files and directories: among other things, this caused the package to conflict with the 'GeoIP' package in CentOS 7 and 'GeoIP-GeoLite-data' in CentOS 8; the files are now owned by 'root' (GH#76) --- .gitignore | 1 + geoipupdate.spec | 26 ++++++++++++++++++++------ sources | 2 +- 3 files changed, 22 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 867f78a..0b8e465 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /geoipupdate-4.0.6.tar.gz /geoipupdate-4.1.4.tar.gz /geoipupdate-4.1.5.tar.gz +/geoipupdate-4.2.2.tar.gz diff --git a/geoipupdate.spec b/geoipupdate.spec index 2b735df..2582679 100644 --- a/geoipupdate.spec +++ b/geoipupdate.spec @@ -2,12 +2,12 @@ # https://github.com/maxmind/geoipupdate %global goipath github.com/maxmind/geoipupdate -Version: 4.1.5 +Version: 4.2.2 %gometa Name: geoipupdate -Release: 2%{?dist} +Release: 1%{?dist} Summary: Update GeoIP2 and GeoIP Legacy binary databases from MaxMind License: ASL 2.0 or MIT @@ -18,6 +18,7 @@ Source1: geoipupdate.cron BuildRequires: coreutils BuildRequires: crontabs BuildRequires: golang(github.com/gofrs/flock) +# Wants golang(github.com/pkg/errors) ≥ 0.9.1 but seems to work OK with earlier versions BuildRequires: golang(github.com/pkg/errors) BuildRequires: golang(github.com/spf13/pflag) BuildRequires: make @@ -37,8 +38,7 @@ BuildRequires: golang(github.com/stretchr/testify/require) %endif %description -The GeoIP Update program performs automatic updates of GeoIP2 and GeoIP -Legacy binary databases. +The GeoIP Update program performs automatic updates of GeoIP2 binary databases. %package cron Summary: Cron job to do weekly updates of GeoIP databases @@ -49,8 +49,7 @@ Obsoletes: GeoIP-update < 1.6.0 Provides: GeoIP-update = 1.6.0 %description cron -Cron job for weekly updates to GeoIP2 and GeoIP Legacy binary databases from -MaxMind. +Cron job for weekly updates to GeoIP2 binary databases from MaxMind. %prep %goprep @@ -107,6 +106,21 @@ install -p -m 0644 _build/GeoIP.conf.5 %{buildroot}%{_mandir}/man5/GeoIP.conf.5 %config(noreplace) %{_sysconfdir}/cron.weekly/geoipupdate %changelog +* Mon Feb 24 2020 Paul Howarth - 4.2.2-1 +- Update to 4.2.2 + - The major version of the module is now included at the end of the module + path; previously, it was not possible to import the module in projects that + were using Go modules (GH#81) + - A valid account ID and license key combination is now required for database + downloads, so those configuration options are now required + - The error handling when closing a local database file would previously + ignore errors and, upon upgrading to 'github.com/pkg/errors' 0.9.0, would + fail to ignore expected errors (GH#69, GH#70) + - The RPM release was previously lacking the correct owner and group on files + and directories: among other things, this caused the package to conflict + with the 'GeoIP' package in CentOS 7 and 'GeoIP-GeoLite-data' in CentOS 8; + the files are now owned by 'root' (GH#76) + * Tue Jan 28 2020 Fedora Release Engineering - 4.1.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 881b062..2a76904 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (geoipupdate-4.1.5.tar.gz) = be0dc0b4c5231b8dc3122043742081f5cb753ed12fc8757de23e5016b45f6eb6c104365fc509ae78fc1e7be2ef698d38b7a2558ebcc6e2ba6c4aabc51244405e +SHA512 (geoipupdate-4.2.2.tar.gz) = 959e372eb16695e74b84138405980386922a14767e9a8aacea13abca21bbcbe08bc0d554e7493ae341bb497cf8475ea75449d777fd5e3b03117bce077b746109 From 75b62872d88aaa09e71ff319dfe14bf5dd8bf9fd Mon Sep 17 00:00:00 2001 From: Paul Howarth Date: Fri, 17 Apr 2020 10:10:40 +0100 Subject: [PATCH 13/48] Update to 4.3.0 - New upstream release 4.3.0 - First release to Docker Hub (GH#24) - The binary builds are now built with CGO_ENABLED=0 (GH#63) --- .gitignore | 1 + geoipupdate.spec | 9 +++++++-- sources | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 0b8e465..c881204 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /geoipupdate-4.1.4.tar.gz /geoipupdate-4.1.5.tar.gz /geoipupdate-4.2.2.tar.gz +/geoipupdate-4.3.0.tar.gz diff --git a/geoipupdate.spec b/geoipupdate.spec index 2582679..806b920 100644 --- a/geoipupdate.spec +++ b/geoipupdate.spec @@ -2,13 +2,13 @@ # https://github.com/maxmind/geoipupdate %global goipath github.com/maxmind/geoipupdate -Version: 4.2.2 +Version: 4.3.0 %gometa Name: geoipupdate Release: 1%{?dist} -Summary: Update GeoIP2 and GeoIP Legacy binary databases from MaxMind +Summary: Update GeoIP2 binary databases from MaxMind License: ASL 2.0 or MIT URL: http://dev.maxmind.com/geoip/geoipupdate/ @@ -106,6 +106,11 @@ install -p -m 0644 _build/GeoIP.conf.5 %{buildroot}%{_mandir}/man5/GeoIP.conf.5 %config(noreplace) %{_sysconfdir}/cron.weekly/geoipupdate %changelog +* Fri Apr 17 2020 Paul Howarth - 4.3.0-1 +- Update to 4.3.0 + - First release to Docker Hub (GH#24) + - The binary builds are now built with CGO_ENABLED=0 (GH#63) + * Mon Feb 24 2020 Paul Howarth - 4.2.2-1 - Update to 4.2.2 - The major version of the module is now included at the end of the module diff --git a/sources b/sources index 2a76904..70fdaab 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (geoipupdate-4.2.2.tar.gz) = 959e372eb16695e74b84138405980386922a14767e9a8aacea13abca21bbcbe08bc0d554e7493ae341bb497cf8475ea75449d777fd5e3b03117bce077b746109 +SHA512 (geoipupdate-4.3.0.tar.gz) = 2cc40ef436b67e114e854230c439778a139adb05c766e8fdaf70269c23bee4cecee35d5b1a0b12ce9b70185e28231eb97486120fbd2900b8f61c2e6ce6601ad3 From ce662a7efde6389ad7b95e3de5da1d7f6cbc6b8a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 18:30:43 +0000 Subject: [PATCH 14/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- geoipupdate.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/geoipupdate.spec b/geoipupdate.spec index 806b920..28f1769 100644 --- a/geoipupdate.spec +++ b/geoipupdate.spec @@ -7,7 +7,7 @@ Version: 4.3.0 %gometa Name: geoipupdate -Release: 1%{?dist} +Release: 2%{?dist} Summary: Update GeoIP2 binary databases from MaxMind License: ASL 2.0 or MIT @@ -106,6 +106,9 @@ install -p -m 0644 _build/GeoIP.conf.5 %{buildroot}%{_mandir}/man5/GeoIP.conf.5 %config(noreplace) %{_sysconfdir}/cron.weekly/geoipupdate %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 4.3.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Apr 17 2020 Paul Howarth - 4.3.0-1 - Update to 4.3.0 - First release to Docker Hub (GH#24) From ed4530d00ce53b21aa7385448fb36335ffabab6c Mon Sep 17 00:00:00 2001 From: Paul Howarth Date: Thu, 29 Oct 2020 15:36:37 +0000 Subject: [PATCH 15/48] Update to 4.5.0 - New upstream release 4.5.0 - The edition ID is now included when there is a failure retrieving a database - The Docker image no longer prints the generated GeoIP.conf when starting up, which prevents a possible leak of the account's license key (GH#109) - The minimum Go version is now 1.11 - Failing HTTP requests are now retried using an exponential backoff: the period to keep retrying any failed request is set to 5 minutes by default and can be adjusted using the new RetryFor configuration option - When using the go package rather than the command-line tool, the default value for RetryFor will be 0 seconds, which means no retries will be performed: to change that, set RetryFor explicitly in the Config you provide, or obtain your Config value via geoipupdate.NewConfig --- .gitignore | 1 + geoipupdate.spec | 19 +++++++++++++++++-- sources | 2 +- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index c881204..710a49b 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /geoipupdate-4.1.5.tar.gz /geoipupdate-4.2.2.tar.gz /geoipupdate-4.3.0.tar.gz +/geoipupdate-4.5.0.tar.gz diff --git a/geoipupdate.spec b/geoipupdate.spec index 28f1769..ea41c4f 100644 --- a/geoipupdate.spec +++ b/geoipupdate.spec @@ -2,12 +2,12 @@ # https://github.com/maxmind/geoipupdate %global goipath github.com/maxmind/geoipupdate -Version: 4.3.0 +Version: 4.5.0 %gometa Name: geoipupdate -Release: 2%{?dist} +Release: 1%{?dist} Summary: Update GeoIP2 binary databases from MaxMind License: ASL 2.0 or MIT @@ -106,6 +106,21 @@ install -p -m 0644 _build/GeoIP.conf.5 %{buildroot}%{_mandir}/man5/GeoIP.conf.5 %config(noreplace) %{_sysconfdir}/cron.weekly/geoipupdate %changelog +* Thu Oct 29 2020 Paul Howarth - 4.5.0-1 +- Update to 4.5.0 + - The edition ID is now included when there is a failure retrieving a + database + - The Docker image no longer prints the generated GeoIP.conf when starting + up, which prevents a possible leak of the account's license key (GH#109) + - The minimum Go version is now 1.11 + - Failing HTTP requests are now retried using an exponential backoff: the + period to keep retrying any failed request is set to 5 minutes by default + and can be adjusted using the new RetryFor configuration option + - When using the go package rather than the command-line tool, the default + value for RetryFor will be 0 seconds, which means no retries will be + performed: to change that, set RetryFor explicitly in the Config you + provide, or obtain your Config value via geoipupdate.NewConfig + * Mon Jul 27 2020 Fedora Release Engineering - 4.3.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 70fdaab..9eab58a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (geoipupdate-4.3.0.tar.gz) = 2cc40ef436b67e114e854230c439778a139adb05c766e8fdaf70269c23bee4cecee35d5b1a0b12ce9b70185e28231eb97486120fbd2900b8f61c2e6ce6601ad3 +SHA512 (geoipupdate-4.5.0.tar.gz) = 7ef2f364992aa96b4b72048052fca2de4e80c823da385199804530151536ee518b4298c19ad0f6db5aa943191c02e86283a23fabf3f718dbe704bcc07507a026 From 27710cf70d4672bb8056a64bfe6e4b99633535ad Mon Sep 17 00:00:00 2001 From: Paul Howarth Date: Tue, 15 Dec 2020 11:05:56 +0000 Subject: [PATCH 16/48] Update to 4.6.0 - New upstream release 4.6.0 - Show version number in verbose output - Retry downloads in more scenarios: previously we would not retry failures occurring when reading the response body, but now we do --- .gitignore | 1 + geoipupdate.spec | 8 +++++++- sources | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 710a49b..db8b218 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /geoipupdate-4.2.2.tar.gz /geoipupdate-4.3.0.tar.gz /geoipupdate-4.5.0.tar.gz +/geoipupdate-4.6.0.tar.gz diff --git a/geoipupdate.spec b/geoipupdate.spec index ea41c4f..6f64be3 100644 --- a/geoipupdate.spec +++ b/geoipupdate.spec @@ -2,7 +2,7 @@ # https://github.com/maxmind/geoipupdate %global goipath github.com/maxmind/geoipupdate -Version: 4.5.0 +Version: 4.6.0 %gometa @@ -106,6 +106,12 @@ install -p -m 0644 _build/GeoIP.conf.5 %{buildroot}%{_mandir}/man5/GeoIP.conf.5 %config(noreplace) %{_sysconfdir}/cron.weekly/geoipupdate %changelog +* Tue Dec 15 2020 Paul Howarth - 4.6.0-1 +- Update to 4.6.0 + - Show version number in verbose output + - Retry downloads in more scenarios: previously we would not retry failures + occurring when reading the response body, but now we do + * Thu Oct 29 2020 Paul Howarth - 4.5.0-1 - Update to 4.5.0 - The edition ID is now included when there is a failure retrieving a diff --git a/sources b/sources index 9eab58a..39bc5da 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (geoipupdate-4.5.0.tar.gz) = 7ef2f364992aa96b4b72048052fca2de4e80c823da385199804530151536ee518b4298c19ad0f6db5aa943191c02e86283a23fabf3f718dbe704bcc07507a026 +SHA512 (geoipupdate-4.6.0.tar.gz) = 82686317559fc0adeeb04a8128ae66ad05fb53b0510f169ae97aa4ef4341a94713d3e9c68a716a101640ddc6bda0b342a9c6bde51e09d53229bc05cea009abb8 From 37c33eda21c16c1a33bc8933010c4c63edd4387a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 06:35:49 +0000 Subject: [PATCH 17/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- geoipupdate.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/geoipupdate.spec b/geoipupdate.spec index 6f64be3..6557e22 100644 --- a/geoipupdate.spec +++ b/geoipupdate.spec @@ -7,7 +7,7 @@ Version: 4.6.0 %gometa Name: geoipupdate -Release: 1%{?dist} +Release: 2%{?dist} Summary: Update GeoIP2 binary databases from MaxMind License: ASL 2.0 or MIT @@ -106,6 +106,9 @@ install -p -m 0644 _build/GeoIP.conf.5 %{buildroot}%{_mandir}/man5/GeoIP.conf.5 %config(noreplace) %{_sysconfdir}/cron.weekly/geoipupdate %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 4.6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Dec 15 2020 Paul Howarth - 4.6.0-1 - Update to 4.6.0 - Show version number in verbose output From a51a89139ad90b822ff29376c8cccaac758e2483 Mon Sep 17 00:00:00 2001 From: Paul Howarth Date: Wed, 21 Jul 2021 14:25:39 +0100 Subject: [PATCH 18/48] Update to 4.8.0 - New upstream release 4.8.0 - Go 1.13 or greater is now required - In verbose mode, we now print a message before each HTTP request; previously we would not print anything for retried requests - Expected response errors no longer cause request retries; for example, we no longer retry the download request if the database subscription has lapsed --- .gitignore | 1 + geoipupdate.spec | 12 ++++++++++-- sources | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index db8b218..35f3cda 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /geoipupdate-4.3.0.tar.gz /geoipupdate-4.5.0.tar.gz /geoipupdate-4.6.0.tar.gz +/geoipupdate-4.8.0.tar.gz diff --git a/geoipupdate.spec b/geoipupdate.spec index 6557e22..ec7b1c7 100644 --- a/geoipupdate.spec +++ b/geoipupdate.spec @@ -2,12 +2,12 @@ # https://github.com/maxmind/geoipupdate %global goipath github.com/maxmind/geoipupdate -Version: 4.6.0 +Version: 4.8.0 %gometa Name: geoipupdate -Release: 2%{?dist} +Release: 1%{?dist} Summary: Update GeoIP2 binary databases from MaxMind License: ASL 2.0 or MIT @@ -106,6 +106,14 @@ install -p -m 0644 _build/GeoIP.conf.5 %{buildroot}%{_mandir}/man5/GeoIP.conf.5 %config(noreplace) %{_sysconfdir}/cron.weekly/geoipupdate %changelog +* Wed Jul 21 2021 Paul Howarth - 4.8.0-1 +- Update to 4.8.0 + - Go 1.13 or greater is now required + - In verbose mode, we now print a message before each HTTP request; previously + we would not print anything for retried requests + - Expected response errors no longer cause request retries; for example, we no + longer retry the download request if the database subscription has lapsed + * Tue Jan 26 2021 Fedora Release Engineering - 4.6.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index 39bc5da..061f249 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (geoipupdate-4.6.0.tar.gz) = 82686317559fc0adeeb04a8128ae66ad05fb53b0510f169ae97aa4ef4341a94713d3e9c68a716a101640ddc6bda0b342a9c6bde51e09d53229bc05cea009abb8 +SHA512 (geoipupdate-4.8.0.tar.gz) = 55a5ba2b0b92abfc1e7837206222702aaf98d2bd00494915426e02ead0004f5546f4e2abe99a914bebd41690b1253d7a2b19098c110882c5862a3bbf2092234a From fa8fbee2398059827bc48d8e8051106bc2bfd1cf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 00:02:16 +0000 Subject: [PATCH 19/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- geoipupdate.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/geoipupdate.spec b/geoipupdate.spec index ec7b1c7..af11587 100644 --- a/geoipupdate.spec +++ b/geoipupdate.spec @@ -7,7 +7,7 @@ Version: 4.8.0 %gometa Name: geoipupdate -Release: 1%{?dist} +Release: 2%{?dist} Summary: Update GeoIP2 binary databases from MaxMind License: ASL 2.0 or MIT @@ -106,6 +106,9 @@ install -p -m 0644 _build/GeoIP.conf.5 %{buildroot}%{_mandir}/man5/GeoIP.conf.5 %config(noreplace) %{_sysconfdir}/cron.weekly/geoipupdate %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 4.8.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed Jul 21 2021 Paul Howarth - 4.8.0-1 - Update to 4.8.0 - Go 1.13 or greater is now required From f57ba7a128305df175b16acfe9f6f2614b46a298 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 04:12:33 +0000 Subject: [PATCH 20/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- geoipupdate.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/geoipupdate.spec b/geoipupdate.spec index af11587..0fd7c6b 100644 --- a/geoipupdate.spec +++ b/geoipupdate.spec @@ -7,7 +7,7 @@ Version: 4.8.0 %gometa Name: geoipupdate -Release: 2%{?dist} +Release: 3%{?dist} Summary: Update GeoIP2 binary databases from MaxMind License: ASL 2.0 or MIT @@ -106,6 +106,9 @@ install -p -m 0644 _build/GeoIP.conf.5 %{buildroot}%{_mandir}/man5/GeoIP.conf.5 %config(noreplace) %{_sysconfdir}/cron.weekly/geoipupdate %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 4.8.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Jul 22 2021 Fedora Release Engineering - 4.8.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From fd7ae0e5baaae493db9e6373d6850d1a96e455bc Mon Sep 17 00:00:00 2001 From: Paul Howarth Date: Wed, 16 Feb 2022 09:36:31 +0000 Subject: [PATCH 21/48] Update to 4.9.0 - New upstream release 4.9.0 - The client now sets the User-Agent header - The error handling has been improved --- .gitignore | 1 + geoipupdate.rpmlintrc | 5 ----- geoipupdate.spec | 9 +++++++-- sources | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 35f3cda..4186e86 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /geoipupdate-4.5.0.tar.gz /geoipupdate-4.6.0.tar.gz /geoipupdate-4.8.0.tar.gz +/geoipupdate-4.9.0.tar.gz diff --git a/geoipupdate.rpmlintrc b/geoipupdate.rpmlintrc index d5305a6..cf120c1 100644 --- a/geoipupdate.rpmlintrc +++ b/geoipupdate.rpmlintrc @@ -8,8 +8,3 @@ addFilter("executable-marked-as-config-file /etc/cron.weekly/geoipupdate") # geoipupdate-cron6 is obsolete (upstream stopped providing free IPv6 databases) and not replaced addFilter("obsolete-not-provided geoipupdate-cron6") - -# Technical term -addFilter("spelling-error Summary\(en_US\) Cron -> ") -addFilter("spelling-error %description -l en_US Cron -> ") - diff --git a/geoipupdate.spec b/geoipupdate.spec index 0fd7c6b..ce273d3 100644 --- a/geoipupdate.spec +++ b/geoipupdate.spec @@ -2,12 +2,12 @@ # https://github.com/maxmind/geoipupdate %global goipath github.com/maxmind/geoipupdate -Version: 4.8.0 +Version: 4.9.0 %gometa Name: geoipupdate -Release: 3%{?dist} +Release: 1%{?dist} Summary: Update GeoIP2 binary databases from MaxMind License: ASL 2.0 or MIT @@ -106,6 +106,11 @@ install -p -m 0644 _build/GeoIP.conf.5 %{buildroot}%{_mandir}/man5/GeoIP.conf.5 %config(noreplace) %{_sysconfdir}/cron.weekly/geoipupdate %changelog +* Wed Feb 16 2022 Paul Howarth - 4.9.0-1 +- Update to 4.9.0 + - The client now sets the User-Agent header + - The error handling has been improved + * Thu Jan 20 2022 Fedora Release Engineering - 4.8.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index 061f249..67f6f9c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (geoipupdate-4.8.0.tar.gz) = 55a5ba2b0b92abfc1e7837206222702aaf98d2bd00494915426e02ead0004f5546f4e2abe99a914bebd41690b1253d7a2b19098c110882c5862a3bbf2092234a +SHA512 (geoipupdate-4.9.0.tar.gz) = 29d0639fe636885b1527b4cb795332c103c011d028ada80eb7b07805d91f575554fc0b9fa9a506c644236a2ceab5509f54f0cc1a03a300480350c520484d959c From 0f047593bd0e5cc95c8be7eaf1824ffd3660adad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Fri, 17 Jun 2022 22:31:50 +0200 Subject: [PATCH 22/48] Rebuilt for CVE-2022-1996, CVE-2022-24675, CVE-2022-28327, CVE-2022-27191, CVE-2022-29526, CVE-2022-30629 --- geoipupdate.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/geoipupdate.spec b/geoipupdate.spec index ce273d3..598fbc4 100644 --- a/geoipupdate.spec +++ b/geoipupdate.spec @@ -7,7 +7,7 @@ Version: 4.9.0 %gometa Name: geoipupdate -Release: 1%{?dist} +Release: 2%{?dist} Summary: Update GeoIP2 binary databases from MaxMind License: ASL 2.0 or MIT @@ -106,6 +106,10 @@ install -p -m 0644 _build/GeoIP.conf.5 %{buildroot}%{_mandir}/man5/GeoIP.conf.5 %config(noreplace) %{_sysconfdir}/cron.weekly/geoipupdate %changelog +* Fri Jun 17 2022 Robert-André Mauchin - 4.9.0-2 +- Rebuilt for CVE-2022-1996, CVE-2022-24675, CVE-2022-28327, CVE-2022-27191, + CVE-2022-29526, CVE-2022-30629 + * Wed Feb 16 2022 Paul Howarth - 4.9.0-1 - Update to 4.9.0 - The client now sets the User-Agent header From b7219dd05f01391d944f5e31f3a5e6ed778b3b10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Sat, 18 Jun 2022 10:58:03 +0200 Subject: [PATCH 23/48] Rebuilt for CVE-2022-1996, CVE-2022-24675, CVE-2022-28327, CVE-2022-27191, CVE-2022-29526, CVE-2022-30629 From 5b622338f8fa079d5ac8b7bd17cca43c998cd4ce Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Tue, 19 Jul 2022 13:55:02 -0500 Subject: [PATCH 24/48] Rebuild for CVE-2022-{1705,32148,30631,30633,28131,30635,30632,30630,1962} in golang --- geoipupdate.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/geoipupdate.spec b/geoipupdate.spec index 598fbc4..6e1e1f1 100644 --- a/geoipupdate.spec +++ b/geoipupdate.spec @@ -7,7 +7,7 @@ Version: 4.9.0 %gometa Name: geoipupdate -Release: 2%{?dist} +Release: 3%{?dist} Summary: Update GeoIP2 binary databases from MaxMind License: ASL 2.0 or MIT @@ -106,6 +106,10 @@ install -p -m 0644 _build/GeoIP.conf.5 %{buildroot}%{_mandir}/man5/GeoIP.conf.5 %config(noreplace) %{_sysconfdir}/cron.weekly/geoipupdate %changelog +* Tue Jul 19 2022 Maxwell G - 4.9.0-3 +- Rebuild for CVE-2022-{1705,32148,30631,30633,28131,30635,30632,30630,1962} in + golang + * Fri Jun 17 2022 Robert-André Mauchin - 4.9.0-2 - Rebuilt for CVE-2022-1996, CVE-2022-24675, CVE-2022-28327, CVE-2022-27191, CVE-2022-29526, CVE-2022-30629 From 9c5486e7439ae47232c8f092e2a508697c06a72d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 04:23:32 +0000 Subject: [PATCH 25/48] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- geoipupdate.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/geoipupdate.spec b/geoipupdate.spec index 6e1e1f1..dc67951 100644 --- a/geoipupdate.spec +++ b/geoipupdate.spec @@ -7,7 +7,7 @@ Version: 4.9.0 %gometa Name: geoipupdate -Release: 3%{?dist} +Release: 4%{?dist} Summary: Update GeoIP2 binary databases from MaxMind License: ASL 2.0 or MIT @@ -106,6 +106,9 @@ install -p -m 0644 _build/GeoIP.conf.5 %{buildroot}%{_mandir}/man5/GeoIP.conf.5 %config(noreplace) %{_sysconfdir}/cron.weekly/geoipupdate %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 4.9.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Tue Jul 19 2022 Maxwell G - 4.9.0-3 - Rebuild for CVE-2022-{1705,32148,30631,30633,28131,30635,30632,30630,1962} in golang From 2b710055351ec776e7529b12ca458bc278a3a80f Mon Sep 17 00:00:00 2001 From: Paul Howarth Date: Tue, 27 Sep 2022 09:43:04 +0100 Subject: [PATCH 26/48] Update to 4.10.0 - New upstream release 4.10.0 - HTTPS proxies are now supported (GH#172) - An HTTP request to get the filename for the edition ID has been removed; this was previously required as the GeoIP Legacy edition IDs bore little relation to the name of the database on disk - Use SPDX-format license tag --- .gitignore | 1 + geoipupdate.spec | 14 +++++++++++--- sources | 2 +- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 4186e86..f7253e8 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /geoipupdate-4.6.0.tar.gz /geoipupdate-4.8.0.tar.gz /geoipupdate-4.9.0.tar.gz +/geoipupdate-4.10.0.tar.gz diff --git a/geoipupdate.spec b/geoipupdate.spec index dc67951..67ce017 100644 --- a/geoipupdate.spec +++ b/geoipupdate.spec @@ -2,15 +2,15 @@ # https://github.com/maxmind/geoipupdate %global goipath github.com/maxmind/geoipupdate -Version: 4.9.0 +Version: 4.10.0 %gometa Name: geoipupdate -Release: 4%{?dist} +Release: 1%{?dist} Summary: Update GeoIP2 binary databases from MaxMind -License: ASL 2.0 or MIT +License: Apache-2.0 OR MIT URL: http://dev.maxmind.com/geoip/geoipupdate/ Source0: %{gosource} Source1: geoipupdate.cron @@ -106,6 +106,14 @@ install -p -m 0644 _build/GeoIP.conf.5 %{buildroot}%{_mandir}/man5/GeoIP.conf.5 %config(noreplace) %{_sysconfdir}/cron.weekly/geoipupdate %changelog +* Tue Sep 27 2022 Paul Howarth - 4.10.0-1 +- Update to 4.10.0 + - HTTPS proxies are now supported (GH#172) + - An HTTP request to get the filename for the edition ID has been removed; + this was previously required as the GeoIP Legacy edition IDs bore little + relation to the name of the database on disk +- Use SPDX-format license tag + * Thu Jul 21 2022 Fedora Release Engineering - 4.9.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index 67f6f9c..5a058bd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (geoipupdate-4.9.0.tar.gz) = 29d0639fe636885b1527b4cb795332c103c011d028ada80eb7b07805d91f575554fc0b9fa9a506c644236a2ceab5509f54f0cc1a03a300480350c520484d959c +SHA512 (geoipupdate-4.10.0.tar.gz) = 883a5c49cee8e2b80a91aa78abd78c64591bac093436d8ac7ad59ef0a38a065016fe0caca0fd642957bcf61efc74891bd5ab232ef87bc8499ce118090cb214ee From 8b196bad29cc81695f8536c8074fb3e3ef42ee9b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 04:38:38 +0000 Subject: [PATCH 27/48] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- geoipupdate.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/geoipupdate.spec b/geoipupdate.spec index 67ce017..420e5e5 100644 --- a/geoipupdate.spec +++ b/geoipupdate.spec @@ -7,7 +7,7 @@ Version: 4.10.0 %gometa Name: geoipupdate -Release: 1%{?dist} +Release: 2%{?dist} Summary: Update GeoIP2 binary databases from MaxMind License: Apache-2.0 OR MIT @@ -106,6 +106,9 @@ install -p -m 0644 _build/GeoIP.conf.5 %{buildroot}%{_mandir}/man5/GeoIP.conf.5 %config(noreplace) %{_sysconfdir}/cron.weekly/geoipupdate %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 4.10.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Tue Sep 27 2022 Paul Howarth - 4.10.0-1 - Update to 4.10.0 - HTTPS proxies are now supported (GH#172) From 6a51f2bb83444ce05351d04b1215a9b386622fef Mon Sep 17 00:00:00 2001 From: Paul Howarth Date: Fri, 17 Mar 2023 10:38:48 +0000 Subject: [PATCH 28/48] Update to 4.11.1 - New upstream release 4.11.1 - 'github.com/pkg/errors' is no longer used to wrap errors - Docker secrets are now supported for the MaxMind account ID and license key (GH#197) - The Dockerfile now has a Healthcheck that makes sure the modification date of the database directory is within the update period - The Docker images are now published to the GitHub Container Registry, 'ghcr.io'; we will likely stop publishing to Docker Hub in the near future --- .gitignore | 1 + geoipupdate.spec | 16 ++++++++++++---- sources | 2 +- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index f7253e8..d4eb57f 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /geoipupdate-4.8.0.tar.gz /geoipupdate-4.9.0.tar.gz /geoipupdate-4.10.0.tar.gz +/geoipupdate-4.11.1.tar.gz diff --git a/geoipupdate.spec b/geoipupdate.spec index 420e5e5..3a77c83 100644 --- a/geoipupdate.spec +++ b/geoipupdate.spec @@ -2,12 +2,12 @@ # https://github.com/maxmind/geoipupdate %global goipath github.com/maxmind/geoipupdate -Version: 4.10.0 +Version: 4.11.1 %gometa Name: geoipupdate -Release: 2%{?dist} +Release: 1%{?dist} Summary: Update GeoIP2 binary databases from MaxMind License: Apache-2.0 OR MIT @@ -18,8 +18,6 @@ Source1: geoipupdate.cron BuildRequires: coreutils BuildRequires: crontabs BuildRequires: golang(github.com/gofrs/flock) -# Wants golang(github.com/pkg/errors) ≥ 0.9.1 but seems to work OK with earlier versions -BuildRequires: golang(github.com/pkg/errors) BuildRequires: golang(github.com/spf13/pflag) BuildRequires: make BuildRequires: pandoc @@ -106,6 +104,16 @@ install -p -m 0644 _build/GeoIP.conf.5 %{buildroot}%{_mandir}/man5/GeoIP.conf.5 %config(noreplace) %{_sysconfdir}/cron.weekly/geoipupdate %changelog +* Fri Mar 17 2023 Paul Howarth - 4.11.1-1 +- Update to 4.11.1 + - 'github.com/pkg/errors' is no longer used to wrap errors + - Docker secrets are now supported for the MaxMind account ID and license + key (GH#197) + - The Dockerfile now has a Healthcheck that makes sure the modification date + of the database directory is within the update period + - The Docker images are now published to the GitHub Container Registry, + 'ghcr.io'; we will likely stop publishing to Docker Hub in the near future + * Thu Jan 19 2023 Fedora Release Engineering - 4.10.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index 5a058bd..f4b3fa7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (geoipupdate-4.10.0.tar.gz) = 883a5c49cee8e2b80a91aa78abd78c64591bac093436d8ac7ad59ef0a38a065016fe0caca0fd642957bcf61efc74891bd5ab232ef87bc8499ce118090cb214ee +SHA512 (geoipupdate-4.11.1.tar.gz) = eae1abde1b0e64098e6241f3e9b5bb6a489f09bda50833bc6be058d7dd96a5cdc988eb1a3a85e9d3c8d53200fd886b5a75c6a075cc36a75e02ddb7ff895d8fa5 From 648ef7e8213b5dc795d7cad1a2e64f9c2c08ce22 Mon Sep 17 00:00:00 2001 From: Paul Howarth Date: Thu, 13 Apr 2023 14:00:24 +0100 Subject: [PATCH 29/48] Update to 5.0.0 - New upstream release 5.0.0 - Redefined the 'Reader' and 'Writer' interface APIs in 'pkg/geoipupdate/database'; this change aims to to make it easier to introduce custom implementations of these interfaces - Changed the signature of 'NewConfig' in 'pkg/geoipupdate' to accept optional parameters; this change allows the introduction of new flags or config options without making breaking changes to the function's signature - Introduced 'Parallelism' as a new flag and config option to enable concurrent database updates --- .gitignore | 1 + geoipupdate.spec | 14 +++++++++++++- sources | 2 +- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index d4eb57f..2414fd2 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ /geoipupdate-4.9.0.tar.gz /geoipupdate-4.10.0.tar.gz /geoipupdate-4.11.1.tar.gz +/geoipupdate-5.0.0.tar.gz diff --git a/geoipupdate.spec b/geoipupdate.spec index 3a77c83..4f1c0e7 100644 --- a/geoipupdate.spec +++ b/geoipupdate.spec @@ -2,7 +2,7 @@ # https://github.com/maxmind/geoipupdate %global goipath github.com/maxmind/geoipupdate -Version: 4.11.1 +Version: 5.0.0 %gometa @@ -19,6 +19,7 @@ BuildRequires: coreutils BuildRequires: crontabs BuildRequires: golang(github.com/gofrs/flock) BuildRequires: golang(github.com/spf13/pflag) +BuildRequires: golang(golang.org/x/sync/errgroup) BuildRequires: make BuildRequires: pandoc BuildRequires: perl-interpreter @@ -104,6 +105,17 @@ install -p -m 0644 _build/GeoIP.conf.5 %{buildroot}%{_mandir}/man5/GeoIP.conf.5 %config(noreplace) %{_sysconfdir}/cron.weekly/geoipupdate %changelog +* Thu Apr 13 2023 Paul Howarth - 5.0.0-1 +- Update to 5.0.0 + - Redefined the 'Reader' and 'Writer' interface APIs in + 'pkg/geoipupdate/database'; this change aims to to make it easier to + introduce custom implementations of these interfaces + - Changed the signature of 'NewConfig' in 'pkg/geoipupdate' to accept + optional parameters; this change allows the introduction of new flags or + config options without making breaking changes to the function's signature + - Introduced 'Parallelism' as a new flag and config option to enable + concurrent database updates + * Fri Mar 17 2023 Paul Howarth - 4.11.1-1 - Update to 4.11.1 - 'github.com/pkg/errors' is no longer used to wrap errors diff --git a/sources b/sources index f4b3fa7..28f612c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (geoipupdate-4.11.1.tar.gz) = eae1abde1b0e64098e6241f3e9b5bb6a489f09bda50833bc6be058d7dd96a5cdc988eb1a3a85e9d3c8d53200fd886b5a75c6a075cc36a75e02ddb7ff895d8fa5 +SHA512 (geoipupdate-5.0.0.tar.gz) = f19c71454cb406b57bb6559a008d2be03bf33a1c670f5ac4699dc31052eed106e7fa7b34e7ca9135a2ba98508252bad7fd9e9fd063075aaddb1e47e2d9d7e7eb From c5587ab28ea7594ba99ae9d95971bec654130820 Mon Sep 17 00:00:00 2001 From: Paul Howarth Date: Wed, 19 Apr 2023 09:48:51 +0100 Subject: [PATCH 30/48] Update to 5.0.4 - New upstream release 5.0.4 - The 5.0.0 release mistakenly set the file permissions on downloaded databases to 0600; this restores the previous behavior of using 0644 (GH#217, GH#218) - "Database ... up to date" messages are now only shown if the verbose flag is set (GH#219) - Since version 5.0.0, the default database directory was not being correctly set for Debian and RPM package builds - the directory '/usr/local/share/GeoIP' was being used rather than '/usr/share/GeoIP'; this build restores '/usr/share/GeoIP' as the default directory for these builds (GH#222) - Since version 4.9.0, the incorrect commit was tagged; this release attempts to fix the release process to prevent this issue --- .gitignore | 1 + geoipupdate.spec | 17 ++++++++++++++++- sources | 2 +- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 2414fd2..40fe8e0 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ /geoipupdate-4.10.0.tar.gz /geoipupdate-4.11.1.tar.gz /geoipupdate-5.0.0.tar.gz +/geoipupdate-5.0.4.tar.gz diff --git a/geoipupdate.spec b/geoipupdate.spec index 4f1c0e7..9f7618a 100644 --- a/geoipupdate.spec +++ b/geoipupdate.spec @@ -2,7 +2,7 @@ # https://github.com/maxmind/geoipupdate %global goipath github.com/maxmind/geoipupdate -Version: 5.0.0 +Version: 5.0.4 %gometa @@ -105,6 +105,21 @@ install -p -m 0644 _build/GeoIP.conf.5 %{buildroot}%{_mandir}/man5/GeoIP.conf.5 %config(noreplace) %{_sysconfdir}/cron.weekly/geoipupdate %changelog +* Wed Apr 19 2023 Paul Howarth - 5.0.4-1 +- Update to 5.0.4 + - The 5.0.0 release mistakenly set the file permissions on downloaded + databases to 0600; this restores the previous behavior of using 0644 + (GH#217, GH#218) + - "Database ... up to date" messages are now only shown if the verbose flag + is set (GH#219) + - Since version 5.0.0, the default database directory was not being correctly + set for Debian and RPM package builds - the directory + '/usr/local/share/GeoIP' was being used rather than '/usr/share/GeoIP'; + this build restores '/usr/share/GeoIP' as the default directory for these + builds (GH#222) + - Since version 4.9.0, the incorrect commit was tagged; this release attempts + to fix the release process to prevent this issue + * Thu Apr 13 2023 Paul Howarth - 5.0.0-1 - Update to 5.0.0 - Redefined the 'Reader' and 'Writer' interface APIs in diff --git a/sources b/sources index 28f612c..c80aea7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (geoipupdate-5.0.0.tar.gz) = f19c71454cb406b57bb6559a008d2be03bf33a1c670f5ac4699dc31052eed106e7fa7b34e7ca9135a2ba98508252bad7fd9e9fd063075aaddb1e47e2d9d7e7eb +SHA512 (geoipupdate-5.0.4.tar.gz) = fe805847bfc29bd0821d666f2187ed0b73299114e371ddc47c40a82aa5fb467562fc923da09297e7cdac00a8e49e7eaa9682059d6ae0f4c510366ec7f00e3382 From dfe545e6af3648ab4609a490a7789ac2ab110571 Mon Sep 17 00:00:00 2001 From: Paul Howarth Date: Thu, 11 May 2023 11:35:48 +0100 Subject: [PATCH 31/48] Update to 5.1.1 - New upstream release 5.1.1 - Fixed the Docker health-check script to use the correct time of the last update attempt (GH#225) - Added new '--output' flag to print JSON to standard output describing the result of the run - Compilation with Go versions before 1.19 is no longer supported --- .gitignore | 1 + geoipupdate.spec | 10 +++++++++- sources | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 40fe8e0..e841f98 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ /geoipupdate-4.11.1.tar.gz /geoipupdate-5.0.0.tar.gz /geoipupdate-5.0.4.tar.gz +/geoipupdate-5.1.1.tar.gz diff --git a/geoipupdate.spec b/geoipupdate.spec index 9f7618a..35e3bd8 100644 --- a/geoipupdate.spec +++ b/geoipupdate.spec @@ -2,7 +2,7 @@ # https://github.com/maxmind/geoipupdate %global goipath github.com/maxmind/geoipupdate -Version: 5.0.4 +Version: 5.1.1 %gometa @@ -105,6 +105,14 @@ install -p -m 0644 _build/GeoIP.conf.5 %{buildroot}%{_mandir}/man5/GeoIP.conf.5 %config(noreplace) %{_sysconfdir}/cron.weekly/geoipupdate %changelog +* Thu May 11 2023 Paul Howarth - 5.1.1-1 +- Update to 5.1.1 + - Fixed the Docker health-check script to use the correct time of the last + update attempt (GH#225) + - Added new '--output' flag to print JSON to standard output describing the + result of the run + - Compilation with Go versions before 1.19 is no longer supported + * Wed Apr 19 2023 Paul Howarth - 5.0.4-1 - Update to 5.0.4 - The 5.0.0 release mistakenly set the file permissions on downloaded diff --git a/sources b/sources index c80aea7..4a01842 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (geoipupdate-5.0.4.tar.gz) = fe805847bfc29bd0821d666f2187ed0b73299114e371ddc47c40a82aa5fb467562fc923da09297e7cdac00a8e49e7eaa9682059d6ae0f4c510366ec7f00e3382 +SHA512 (geoipupdate-5.1.1.tar.gz) = 3a671adaacc9f9b521d583d68671b59f9bae8e16c4be6cf3e5670ecc265f10b386ba79d167f0945b4bcdbeb9687253feece1755db08cd6d92f5e720a7b2f3c97 From 8036e7601b5330016c2f7b3da61fcc29706cfb9a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 21:04:30 +0000 Subject: [PATCH 32/48] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- geoipupdate.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/geoipupdate.spec b/geoipupdate.spec index 35e3bd8..4d9935a 100644 --- a/geoipupdate.spec +++ b/geoipupdate.spec @@ -7,7 +7,7 @@ Version: 5.1.1 %gometa Name: geoipupdate -Release: 1%{?dist} +Release: 2%{?dist} Summary: Update GeoIP2 binary databases from MaxMind License: Apache-2.0 OR MIT @@ -105,6 +105,9 @@ install -p -m 0644 _build/GeoIP.conf.5 %{buildroot}%{_mandir}/man5/GeoIP.conf.5 %config(noreplace) %{_sysconfdir}/cron.weekly/geoipupdate %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 5.1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu May 11 2023 Paul Howarth - 5.1.1-1 - Update to 5.1.1 - Fixed the Docker health-check script to use the correct time of the last From 73feb196e24f6b80a609f7efbb5ffe5915add0fa Mon Sep 17 00:00:00 2001 From: Paul Howarth Date: Thu, 20 Jul 2023 14:52:46 +0100 Subject: [PATCH 33/48] Update to 6.0.0 - New upstream release 6.0.0 - 'geoipupdate' now supports configuration via environment variables: any configuration set this way will override any value from the config file, but still be overridden by any associated command line option (if any) - The following new environment variables are supported: - GEOIPUPDATE_ACCOUNT_ID - GEOIPUPDATE_ACCOUNT_ID_FILE - GEOIPUPDATE_CONF_FILE - GEOIPUPDATE_DB_DIR - GEOIPUPDATE_EDITION_IDS - GEOIPUPDATE_HOST - GEOIPUPDATE_LICENSE_KEY - GEOIPUPDATE_LICENSE_KEY_FILE - GEOIPUPDATE_LOCK_FILE - GEOIPUPDATE_PARALLELISM - GEOIPUPDATE_PRESERVE_FILE_TIMES - GEOIPUPDATE_PROXY - GEOIPUPDATE_PROXY_USER_PASSWORD - GEOIPUPDATE_RETRY_FOR - GEOIPUPDATE_VERBOSE - Changed the signature of 'NewConfig' in 'pkg/geoipupdate' to no longer accept a positional config file path argument, which can now be passed in using the option from 'WithConfigFile' along with the other optional parameters - 'geoipupdate' and 'NewConfig' no longer require a config file to exist - The '--stack-trace' flag has been removed; this flag has been broken since 4.11.0 --- .gitignore | 1 + geoipupdate.spec | 34 ++++++++++++++++++++++++++++++++-- sources | 2 +- 3 files changed, 34 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index e841f98..8e52fd5 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ /geoipupdate-5.0.0.tar.gz /geoipupdate-5.0.4.tar.gz /geoipupdate-5.1.1.tar.gz +/geoipupdate-6.0.0.tar.gz diff --git a/geoipupdate.spec b/geoipupdate.spec index 4d9935a..27727f6 100644 --- a/geoipupdate.spec +++ b/geoipupdate.spec @@ -2,12 +2,12 @@ # https://github.com/maxmind/geoipupdate %global goipath github.com/maxmind/geoipupdate -Version: 5.1.1 +Version: 6.0.0 %gometa Name: geoipupdate -Release: 2%{?dist} +Release: 1%{?dist} Summary: Update GeoIP2 binary databases from MaxMind License: Apache-2.0 OR MIT @@ -17,6 +17,7 @@ Source1: geoipupdate.cron BuildRequires: coreutils BuildRequires: crontabs +BuildRequires: golang(github.com/cenkalti/backoff/v4) BuildRequires: golang(github.com/gofrs/flock) BuildRequires: golang(github.com/spf13/pflag) BuildRequires: golang(golang.org/x/sync/errgroup) @@ -105,6 +106,35 @@ install -p -m 0644 _build/GeoIP.conf.5 %{buildroot}%{_mandir}/man5/GeoIP.conf.5 %config(noreplace) %{_sysconfdir}/cron.weekly/geoipupdate %changelog +* Thu Jul 20 2023 Paul Howarth - 6.0.0-1 +- Update to 6.0.0 + - 'geoipupdate' now supports configuration via environment variables: any + configuration set this way will override any value from the config file, + but still be overridden by any associated command line option (if any) + - The following new environment variables are supported: + - GEOIPUPDATE_ACCOUNT_ID + - GEOIPUPDATE_ACCOUNT_ID_FILE + - GEOIPUPDATE_CONF_FILE + - GEOIPUPDATE_DB_DIR + - GEOIPUPDATE_EDITION_IDS + - GEOIPUPDATE_HOST + - GEOIPUPDATE_LICENSE_KEY + - GEOIPUPDATE_LICENSE_KEY_FILE + - GEOIPUPDATE_LOCK_FILE + - GEOIPUPDATE_PARALLELISM + - GEOIPUPDATE_PRESERVE_FILE_TIMES + - GEOIPUPDATE_PROXY + - GEOIPUPDATE_PROXY_USER_PASSWORD + - GEOIPUPDATE_RETRY_FOR + - GEOIPUPDATE_VERBOSE + - Changed the signature of 'NewConfig' in 'pkg/geoipupdate' to no longer + accept a positional config file path argument, which can now be passed in + using the option from 'WithConfigFile' along with the other optional + parameters + - 'geoipupdate' and 'NewConfig' no longer require a config file to exist + - The '--stack-trace' flag has been removed; this flag has been broken since + 4.11.0 + * Wed Jul 19 2023 Fedora Release Engineering - 5.1.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index 4a01842..db9cf04 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (geoipupdate-5.1.1.tar.gz) = 3a671adaacc9f9b521d583d68671b59f9bae8e16c4be6cf3e5670ecc265f10b386ba79d167f0945b4bcdbeb9687253feece1755db08cd6d92f5e720a7b2f3c97 +SHA512 (geoipupdate-6.0.0.tar.gz) = 2b2a6573b6af30ad1ad4c8ed3b97df41bba96212a0e6d90e4a92bd0615f02c9e989168ad56a651d8f35a7d2534e223de5a6f8a34d587f3c8a7a8e19f3b913ca4 From 05db224588c6481ca802a31a5efb44bef94c295f Mon Sep 17 00:00:00 2001 From: Paul Howarth Date: Wed, 10 Jan 2024 14:47:32 +0000 Subject: [PATCH 34/48] Update to 6.1.0 - New upstream release 6.1.0 - 'geoipupdate' now sets the version in the 'User-Agent' header to the version in the binary; while there were no issues with the version in the header, this makes sure it will match the binary (the header also now includes build information, such as OS and architecture) - White spaces in secret files 'GEOIPUPDATE_ACCOUNT_ID_FILE', 'GEOIPUPDATE_LICENSE_KEY_FILE' are ignored (GH#262) --- .gitignore | 1 + geoipupdate.spec | 11 ++++++++++- sources | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 8e52fd5..baaaa2b 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ /geoipupdate-5.0.4.tar.gz /geoipupdate-5.1.1.tar.gz /geoipupdate-6.0.0.tar.gz +/geoipupdate-6.1.0.tar.gz diff --git a/geoipupdate.spec b/geoipupdate.spec index 27727f6..aa3bacc 100644 --- a/geoipupdate.spec +++ b/geoipupdate.spec @@ -2,7 +2,7 @@ # https://github.com/maxmind/geoipupdate %global goipath github.com/maxmind/geoipupdate -Version: 6.0.0 +Version: 6.1.0 %gometa @@ -106,6 +106,15 @@ install -p -m 0644 _build/GeoIP.conf.5 %{buildroot}%{_mandir}/man5/GeoIP.conf.5 %config(noreplace) %{_sysconfdir}/cron.weekly/geoipupdate %changelog +* Wed Jan 10 2024 Paul Howarth - 6.1.0-1 +- Update to 6.1.0 + - 'geoipupdate' now sets the version in the 'User-Agent' header to the + version in the binary; while there were no issues with the version in the + header, this makes sure it will match the binary (the header also now + includes build information, such as OS and architecture) + - White spaces in secret files 'GEOIPUPDATE_ACCOUNT_ID_FILE', + 'GEOIPUPDATE_LICENSE_KEY_FILE' are ignored (GH#262) + * Thu Jul 20 2023 Paul Howarth - 6.0.0-1 - Update to 6.0.0 - 'geoipupdate' now supports configuration via environment variables: any diff --git a/sources b/sources index db9cf04..3a05dac 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (geoipupdate-6.0.0.tar.gz) = 2b2a6573b6af30ad1ad4c8ed3b97df41bba96212a0e6d90e4a92bd0615f02c9e989168ad56a651d8f35a7d2534e223de5a6f8a34d587f3c8a7a8e19f3b913ca4 +SHA512 (geoipupdate-6.1.0.tar.gz) = b20a3101fb055ed71fe999fe924b71f6d0eb76da8bc4444f7281a3deceac1ee7d1854f3d672b93edabf152cc69551933dd951419ab484259d47f56b243e568eb From be45c4b3acab119d9d4fa598393d9715da5e058c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 20:32:22 +0000 Subject: [PATCH 35/48] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- geoipupdate.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/geoipupdate.spec b/geoipupdate.spec index aa3bacc..1ae3d76 100644 --- a/geoipupdate.spec +++ b/geoipupdate.spec @@ -7,7 +7,7 @@ Version: 6.1.0 %gometa Name: geoipupdate -Release: 1%{?dist} +Release: 2%{?dist} Summary: Update GeoIP2 binary databases from MaxMind License: Apache-2.0 OR MIT @@ -106,6 +106,9 @@ install -p -m 0644 _build/GeoIP.conf.5 %{buildroot}%{_mandir}/man5/GeoIP.conf.5 %config(noreplace) %{_sysconfdir}/cron.weekly/geoipupdate %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 6.1.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jan 10 2024 Paul Howarth - 6.1.0-1 - Update to 6.1.0 - 'geoipupdate' now sets the version in the 'User-Agent' header to the From 9600e47d396e8c3673fcd4b8f5601ff3052eab62 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 12:47:38 +0000 Subject: [PATCH 36/48] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- geoipupdate.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/geoipupdate.spec b/geoipupdate.spec index 1ae3d76..1db9192 100644 --- a/geoipupdate.spec +++ b/geoipupdate.spec @@ -7,7 +7,7 @@ Version: 6.1.0 %gometa Name: geoipupdate -Release: 2%{?dist} +Release: 3%{?dist} Summary: Update GeoIP2 binary databases from MaxMind License: Apache-2.0 OR MIT @@ -106,6 +106,9 @@ install -p -m 0644 _build/GeoIP.conf.5 %{buildroot}%{_mandir}/man5/GeoIP.conf.5 %config(noreplace) %{_sysconfdir}/cron.weekly/geoipupdate %changelog +* Wed Jan 24 2024 Fedora Release Engineering - 6.1.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 6.1.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From e40aad91008fb368569624c0da2ec977f5c2e5cf Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Sun, 11 Feb 2024 22:04:38 +0000 Subject: [PATCH 37/48] Rebuild for golang 1.22.0 --- geoipupdate.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/geoipupdate.spec b/geoipupdate.spec index 1db9192..ce1b952 100644 --- a/geoipupdate.spec +++ b/geoipupdate.spec @@ -7,7 +7,7 @@ Version: 6.1.0 %gometa Name: geoipupdate -Release: 3%{?dist} +Release: 4%{?dist} Summary: Update GeoIP2 binary databases from MaxMind License: Apache-2.0 OR MIT @@ -106,6 +106,9 @@ install -p -m 0644 _build/GeoIP.conf.5 %{buildroot}%{_mandir}/man5/GeoIP.conf.5 %config(noreplace) %{_sysconfdir}/cron.weekly/geoipupdate %changelog +* Sun Feb 11 2024 Maxwell G - 6.1.0-4 +- Rebuild for golang 1.22.0 + * Wed Jan 24 2024 Fedora Release Engineering - 6.1.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 93ae7046db5360224416d67fdce8db39a297e3e1 Mon Sep 17 00:00:00 2001 From: Paul Howarth Date: Tue, 9 Apr 2024 09:36:16 +0100 Subject: [PATCH 38/48] Update to 7.0.1 - New upstream release 7.0.1 - BREAKING CHANGE: Improvements to the HTTP download API - The client now calls two new endpoints: - '/geoip/updates/metadata', which is responsible for getting information about a database edition - '/geoip/databases/{edition-id}/download', which is responsible for downloading the content of a database edition; this new endpoint redirects downloads to R2 presigned URLs, so systems running 'geoipupdate' need to be able to reach 'mm-prod-geoip-databases.a2649acb697e2c09b632799562c076f2.r2.cloudflarestorage.com' in addition to 'updates.maxmind.com' - BREAKING CHANGE: The public package API has been redesigned - The previous API was not easy to use and had become a maintenance burden - We now expose a 'Client' at 'github.com/maxmind/geoipupdate/client' with a 'Download()' method - The intention is to expose less of the 'geoipupdate' internals and provide a simpler and easier to use package; many previously exposed methods and types are now either internal only or have been removed - BREAKING CHANGE: If set, 'GEOIPUPDATE_VERBOSE' must either be '0' or '1' - All other values will return an error - Setting 'GEOIPUPDATE_VERBOSE' to '1' now works as expected; in the 6.0.0 and 6.1.0 releases, the flag was ignored (GH#298) - 'geoipupdate' now supports retrying on more types of errors such as HTTP2 INTERNAL_ERROR - Now 'geoipupdate' doesn't require the user to specify the config file if all the other arguments are set via the environment variables (GH#284) --- .gitignore | 1 + geoipupdate.spec | 33 +++++++++++++++++++++++++++++++-- sources | 2 +- 3 files changed, 33 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index baaaa2b..0df9c84 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ /geoipupdate-5.1.1.tar.gz /geoipupdate-6.0.0.tar.gz /geoipupdate-6.1.0.tar.gz +/geoipupdate-7.0.1.tar.gz diff --git a/geoipupdate.spec b/geoipupdate.spec index ce1b952..34b4605 100644 --- a/geoipupdate.spec +++ b/geoipupdate.spec @@ -2,12 +2,12 @@ # https://github.com/maxmind/geoipupdate %global goipath github.com/maxmind/geoipupdate -Version: 6.1.0 +Version: 7.0.1 %gometa Name: geoipupdate -Release: 4%{?dist} +Release: 1%{?dist} Summary: Update GeoIP2 binary databases from MaxMind License: Apache-2.0 OR MIT @@ -20,6 +20,7 @@ BuildRequires: crontabs BuildRequires: golang(github.com/cenkalti/backoff/v4) BuildRequires: golang(github.com/gofrs/flock) BuildRequires: golang(github.com/spf13/pflag) +BuildRequires: golang(golang.org/x/net/http2) BuildRequires: golang(golang.org/x/sync/errgroup) BuildRequires: make BuildRequires: pandoc @@ -106,6 +107,34 @@ install -p -m 0644 _build/GeoIP.conf.5 %{buildroot}%{_mandir}/man5/GeoIP.conf.5 %config(noreplace) %{_sysconfdir}/cron.weekly/geoipupdate %changelog +* Tue Apr 9 2024 Paul Howarth - 7.0.1-1 +- Update to 7.0.1 + BREAKING CHANGE: Improvements to the HTTP download API + - The client now calls two new endpoints: + - '/geoip/updates/metadata', which is responsible for getting information + about a database edition + - '/geoip/databases/{edition-id}/download', which is responsible for + downloading the content of a database edition; this new endpoint + redirects downloads to R2 presigned URLs, so systems running + 'geoipupdate' need to be able to reach + 'mm-prod-geoip-databases.a2649acb697e2c09b632799562c076f2.r2.cloudflarestorage.com' + in addition to 'updates.maxmind.com' + BREAKING CHANGE: The public package API has been redesigned + - The previous API was not easy to use and had become a maintenance burden + - We now expose a 'Client' at 'github.com/maxmind/geoipupdate/client' with a + 'Download()' method + - The intention is to expose less of the 'geoipupdate' internals and provide + a simpler and easier to use package; many previously exposed methods and + types are now either internal only or have been removed + BREAKING CHANGE: If set, 'GEOIPUPDATE_VERBOSE' must either be '0' or '1'; + all other values will return an error + - Setting 'GEOIPUPDATE_VERBOSE' to '1' now works as expected; in the 6.0.0 + and 6.1.0 releases, the flag was ignored (GH#298) + - 'geoipupdate' now supports retrying on more types of errors such as HTTP2 + INTERNAL_ERROR + - Now 'geoipupdate' doesn't require the user to specify the config file if + all the other arguments are set via the environment variables (GH#284) + * Sun Feb 11 2024 Maxwell G - 6.1.0-4 - Rebuild for golang 1.22.0 diff --git a/sources b/sources index 3a05dac..2dd298f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (geoipupdate-6.1.0.tar.gz) = b20a3101fb055ed71fe999fe924b71f6d0eb76da8bc4444f7281a3deceac1ee7d1854f3d672b93edabf152cc69551933dd951419ab484259d47f56b243e568eb +SHA512 (geoipupdate-7.0.1.tar.gz) = a38efbf84621afdcebba94d746c7955db132d829925e19cb3c5332a35fcd34f31e960453e89efb97851b1cd253de4157e405112992b2ed6a02da82d6b2db6323 From 4d9987523bf62e9a8d3427fb46a3623732a57f7e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 00:27:04 +0000 Subject: [PATCH 39/48] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- geoipupdate.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/geoipupdate.spec b/geoipupdate.spec index 34b4605..84ab0cb 100644 --- a/geoipupdate.spec +++ b/geoipupdate.spec @@ -7,7 +7,7 @@ Version: 7.0.1 %gometa Name: geoipupdate -Release: 1%{?dist} +Release: 2%{?dist} Summary: Update GeoIP2 binary databases from MaxMind License: Apache-2.0 OR MIT @@ -107,6 +107,9 @@ install -p -m 0644 _build/GeoIP.conf.5 %{buildroot}%{_mandir}/man5/GeoIP.conf.5 %config(noreplace) %{_sysconfdir}/cron.weekly/geoipupdate %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 7.0.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue Apr 9 2024 Paul Howarth - 7.0.1-1 - Update to 7.0.1 BREAKING CHANGE: Improvements to the HTTP download API From 56d0f43fabd1fbf352fd2b06edb020ef3597cfc6 Mon Sep 17 00:00:00 2001 From: Paul Howarth Date: Tue, 19 Nov 2024 08:40:55 +0000 Subject: [PATCH 40/48] Update to 7.1.0 - New upstream release 7.1.0 - Allow the 'Host' configuration directive and the 'GEOIPUPDATE_HOST' environment variable to accept a value with the scheme set; if not set, it will continue to default to 'https://' (GH#310) - Export 'HTTPError' to enable fine-grained error handling for users of 'github.com/maxmind/geoipupdate/client' (GH#341) --- .gitignore | 1 + geoipupdate.spec | 12 ++++++++++-- sources | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 0df9c84..9b57a0e 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ /geoipupdate-6.0.0.tar.gz /geoipupdate-6.1.0.tar.gz /geoipupdate-7.0.1.tar.gz +/geoipupdate-7.1.0.tar.gz diff --git a/geoipupdate.spec b/geoipupdate.spec index 84ab0cb..6a63daa 100644 --- a/geoipupdate.spec +++ b/geoipupdate.spec @@ -2,12 +2,12 @@ # https://github.com/maxmind/geoipupdate %global goipath github.com/maxmind/geoipupdate -Version: 7.0.1 +Version: 7.1.0 %gometa Name: geoipupdate -Release: 2%{?dist} +Release: 1%{?dist} Summary: Update GeoIP2 binary databases from MaxMind License: Apache-2.0 OR MIT @@ -107,6 +107,14 @@ install -p -m 0644 _build/GeoIP.conf.5 %{buildroot}%{_mandir}/man5/GeoIP.conf.5 %config(noreplace) %{_sysconfdir}/cron.weekly/geoipupdate %changelog +* Tue Nov 19 2024 Paul Howarth - 7.1.0-1 +- Update to 7.1.0 + - Allow the 'Host' configuration directive and the 'GEOIPUPDATE_HOST' + environment variable to accept a value with the scheme set; if not set, it + will continue to default to 'https://' (GH#310) + - Export 'HTTPError' to enable fine-grained error handling for users of + 'github.com/maxmind/geoipupdate/client' (GH#341) + * Thu Jul 18 2024 Fedora Release Engineering - 7.0.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index 2dd298f..89ac251 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (geoipupdate-7.0.1.tar.gz) = a38efbf84621afdcebba94d746c7955db132d829925e19cb3c5332a35fcd34f31e960453e89efb97851b1cd253de4157e405112992b2ed6a02da82d6b2db6323 +SHA512 (geoipupdate-7.1.0.tar.gz) = 8f577e2dc6555dbc29aaff95b3aaf6144237a98ed305011c43a753b1238041b1bb1d49a7218d4820b0592f08db9fd75f142cf2035e0c0b89f04de97818d211a0 From 68e339bb823ae6bc3e89ae429d1846507335a9b8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 19:47:24 +0000 Subject: [PATCH 41/48] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- geoipupdate.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/geoipupdate.spec b/geoipupdate.spec index 6a63daa..acbd31f 100644 --- a/geoipupdate.spec +++ b/geoipupdate.spec @@ -7,7 +7,7 @@ Version: 7.1.0 %gometa Name: geoipupdate -Release: 1%{?dist} +Release: 2%{?dist} Summary: Update GeoIP2 binary databases from MaxMind License: Apache-2.0 OR MIT @@ -107,6 +107,9 @@ install -p -m 0644 _build/GeoIP.conf.5 %{buildroot}%{_mandir}/man5/GeoIP.conf.5 %config(noreplace) %{_sysconfdir}/cron.weekly/geoipupdate %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 7.1.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Tue Nov 19 2024 Paul Howarth - 7.1.0-1 - Update to 7.1.0 - Allow the 'Host' configuration directive and the 'GEOIPUPDATE_HOST' From 17471191b63cd53e8d268f75da8b4bd3f3bfe106 Mon Sep 17 00:00:00 2001 From: Paul Howarth Date: Fri, 11 Jul 2025 12:33:41 +0100 Subject: [PATCH 42/48] Update to 7.1.1 - New upstream release 7.1.1 - Update dependencies and re-build binaries with new Go version; no substantive changes --- .gitignore | 1 + geoipupdate.spec | 11 ++++++++--- sources | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 9b57a0e..e476557 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ /geoipupdate-6.1.0.tar.gz /geoipupdate-7.0.1.tar.gz /geoipupdate-7.1.0.tar.gz +/geoipupdate-7.1.1.tar.gz diff --git a/geoipupdate.spec b/geoipupdate.spec index acbd31f..0fe1293 100644 --- a/geoipupdate.spec +++ b/geoipupdate.spec @@ -2,12 +2,12 @@ # https://github.com/maxmind/geoipupdate %global goipath github.com/maxmind/geoipupdate -Version: 7.1.0 +Version: 7.1.1 %gometa Name: geoipupdate -Release: 2%{?dist} +Release: 1%{?dist} Summary: Update GeoIP2 binary databases from MaxMind License: Apache-2.0 OR MIT @@ -17,7 +17,7 @@ Source1: geoipupdate.cron BuildRequires: coreutils BuildRequires: crontabs -BuildRequires: golang(github.com/cenkalti/backoff/v4) +BuildRequires: golang(github.com/cenkalti/backoff/v5) BuildRequires: golang(github.com/gofrs/flock) BuildRequires: golang(github.com/spf13/pflag) BuildRequires: golang(golang.org/x/net/http2) @@ -107,6 +107,11 @@ install -p -m 0644 _build/GeoIP.conf.5 %{buildroot}%{_mandir}/man5/GeoIP.conf.5 %config(noreplace) %{_sysconfdir}/cron.weekly/geoipupdate %changelog +* Fri Jul 11 2025 Paul Howarth - 7.1.1-1 +- Update to 7.1.1 + - Update dependencies and re-build binaries with new Go version; no + substantive changes + * Thu Jan 16 2025 Fedora Release Engineering - 7.1.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild diff --git a/sources b/sources index 89ac251..9f3552b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (geoipupdate-7.1.0.tar.gz) = 8f577e2dc6555dbc29aaff95b3aaf6144237a98ed305011c43a753b1238041b1bb1d49a7218d4820b0592f08db9fd75f142cf2035e0c0b89f04de97818d211a0 +SHA512 (geoipupdate-7.1.1.tar.gz) = 9be4c7db231b453d3583f9130edb3f8eafac73af44a82bf4778e59592a105c6ccd48446ae9193046bd427c178fef9a9a3ea36baee1d4b04389450b5fbad4dc7e From 9d526cea54042e2525b1460d661a921c914528c8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 21:16:18 +0000 Subject: [PATCH 43/48] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- geoipupdate.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/geoipupdate.spec b/geoipupdate.spec index 0fe1293..963ce3f 100644 --- a/geoipupdate.spec +++ b/geoipupdate.spec @@ -7,7 +7,7 @@ Version: 7.1.1 %gometa Name: geoipupdate -Release: 1%{?dist} +Release: 2%{?dist} Summary: Update GeoIP2 binary databases from MaxMind License: Apache-2.0 OR MIT @@ -107,6 +107,9 @@ install -p -m 0644 _build/GeoIP.conf.5 %{buildroot}%{_mandir}/man5/GeoIP.conf.5 %config(noreplace) %{_sysconfdir}/cron.weekly/geoipupdate %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 7.1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Fri Jul 11 2025 Paul Howarth - 7.1.1-1 - Update to 7.1.1 - Update dependencies and re-build binaries with new Go version; no From 1474e4588b443c97dbffc38637bb5c37bf22b100 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Fri, 15 Aug 2025 14:38:55 -0500 Subject: [PATCH 44/48] Rebuild for golang-1.25.0 --- geoipupdate.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/geoipupdate.spec b/geoipupdate.spec index 963ce3f..c307b79 100644 --- a/geoipupdate.spec +++ b/geoipupdate.spec @@ -7,7 +7,7 @@ Version: 7.1.1 %gometa Name: geoipupdate -Release: 2%{?dist} +Release: 3%{?dist} Summary: Update GeoIP2 binary databases from MaxMind License: Apache-2.0 OR MIT @@ -107,6 +107,9 @@ install -p -m 0644 _build/GeoIP.conf.5 %{buildroot}%{_mandir}/man5/GeoIP.conf.5 %config(noreplace) %{_sysconfdir}/cron.weekly/geoipupdate %changelog +* Fri Aug 15 2025 Maxwell G - 7.1.1-3 +- Rebuild for golang-1.25.0 + * Wed Jul 23 2025 Fedora Release Engineering - 7.1.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 149658a68681fdf309f6c19853276c5bf812eaf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20S=C3=A1ez?= Date: Fri, 10 Oct 2025 13:18:58 +0200 Subject: [PATCH 45/48] rebuild --- geoipupdate.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/geoipupdate.spec b/geoipupdate.spec index c307b79..04c8013 100644 --- a/geoipupdate.spec +++ b/geoipupdate.spec @@ -7,7 +7,7 @@ Version: 7.1.1 %gometa Name: geoipupdate -Release: 3%{?dist} +Release: 4%{?dist} Summary: Update GeoIP2 binary databases from MaxMind License: Apache-2.0 OR MIT @@ -107,6 +107,9 @@ install -p -m 0644 _build/GeoIP.conf.5 %{buildroot}%{_mandir}/man5/GeoIP.conf.5 %config(noreplace) %{_sysconfdir}/cron.weekly/geoipupdate %changelog +* Fri Oct 10 2025 Alejandro Sáez - 7.1.1-4 +- rebuild + * Fri Aug 15 2025 Maxwell G - 7.1.1-3 - Rebuild for golang-1.25.0 From a8733a47edc703472ec5e4707aacb572e5cd6573 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Mon, 6 Oct 2025 06:54:56 +0200 Subject: [PATCH 46/48] Convert to new vendoring guidelines --- .gitignore | 1 + geoipupdate.spec | 90 ++++++++++++++++++++++++-------------------- go-vendor-tools.toml | 8 ++++ sources | 1 + 4 files changed, 60 insertions(+), 40 deletions(-) create mode 100644 go-vendor-tools.toml diff --git a/.gitignore b/.gitignore index e476557..c37416d 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ /geoipupdate-7.0.1.tar.gz /geoipupdate-7.1.0.tar.gz /geoipupdate-7.1.1.tar.gz +/geoipupdate-7.1.1-vendor.tar.bz2 diff --git a/geoipupdate.spec b/geoipupdate.spec index 04c8013..5778bc8 100644 --- a/geoipupdate.spec +++ b/geoipupdate.spec @@ -1,27 +1,33 @@ -%bcond_without check +# Generated by go2rpm 1.18.0 +%bcond check 1 # https://github.com/maxmind/geoipupdate -%global goipath github.com/maxmind/geoipupdate -Version: 7.1.1 +%global goipath github.com/maxmind/geoipupdate/v7 +Version: 7.1.1 -%gometa +%gometa -L -f Name: geoipupdate -Release: 4%{?dist} +Release: 5%{?dist} Summary: Update GeoIP2 binary databases from MaxMind -License: Apache-2.0 OR MIT -URL: http://dev.maxmind.com/geoip/geoipupdate/ -Source0: %{gosource} -Source1: geoipupdate.cron +Name: geoipupdate +Release: %autorelease +Summary: Update GeoIP2 binary databases from MaxMind + +# Generated by go-vendor-tools +License: Apache-2.0 AND BSD-3-Clause AND ISC AND MIT +URL: %{gourl} +Source0: %{gosource} +# Generated by go-vendor-tools +Source1: %{archivename}-vendor.tar.bz2 +Source2: go-vendor-tools.toml +Source3: geoipupdate.cron + BuildRequires: coreutils BuildRequires: crontabs -BuildRequires: golang(github.com/cenkalti/backoff/v5) -BuildRequires: golang(github.com/gofrs/flock) -BuildRequires: golang(github.com/spf13/pflag) -BuildRequires: golang(golang.org/x/net/http2) -BuildRequires: golang(golang.org/x/sync/errgroup) +BuildRequires: go-vendor-tools BuildRequires: make BuildRequires: pandoc BuildRequires: perl-interpreter @@ -32,19 +38,13 @@ BuildRequires: sed # Legacy databases fetched by cron6 sub-package no longer available Obsoletes: geoipupdate-cron6 < %{version}-%{release} -%if %{with check} -# Tests -BuildRequires: golang(github.com/stretchr/testify/assert) -BuildRequires: golang(github.com/stretchr/testify/require) -%endif - %description The GeoIP Update program performs automatic updates of GeoIP2 binary databases. %package cron Summary: Cron job to do weekly updates of GeoIP databases BuildArch: noarch -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: crontabs Obsoletes: GeoIP-update < 1.6.0 Provides: GeoIP-update = 1.6.0 @@ -53,9 +53,15 @@ Provides: GeoIP-update = 1.6.0 Cron job for weekly updates to GeoIP2 binary databases from MaxMind. %prep -%goprep +%goprep -A +%setup -q -T -D -a1 %{forgesetupargs} +%autopatch -p1 + +%generate_buildrequires +%go_vendor_license_buildrequires -c %{S:2} %build +%global gomodulesmode GO111MODULE=on export LDFLAGS='-X main.defaultConfigFile=%{_sysconfdir}/GeoIP.conf -X main.defaultDatabaseDirectory=%{_datadir}/GeoIP ' %gobuild -o %{gobuilddir}/bin/geoipupdate %{goipath}/cmd/geoipupdate @@ -66,39 +72,40 @@ ln -s %{gobuilddir} build make BUILDDIR=%{gobuilddir} CONFFILE=%{_sysconfdir}/GeoIP.conf DATADIR=%{_datadir}/GeoIP data %install -# Install the geoipupdate program -install -d %{buildroot}%{_bindir} -install -p -m 0755 %{gobuilddir}/bin/geoipupdate %{buildroot}%{_bindir}/geoipupdate +%go_vendor_license_install -c %{S:2} +install -m 0755 -vd %{buildroot}%{_bindir} +install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/ # Install the configuration file # By default we just use the free GeoIP2 databases -install -d %{buildroot}%{_sysconfdir} -install -p -m 0644 conf/GeoIP.conf.default %{buildroot}%{_sysconfdir}/GeoIP.conf +install -m 0755 -vd %{buildroot}%{_sysconfdir} +install -m 0644 -vp conf/GeoIP.conf.default %{buildroot}%{_sysconfdir}/GeoIP.conf # Ensure the GeoIP data directory exists # Note: not using %%ghost files for default databases to avoid issues when co-existing with the geolite2 package -install -d %{buildroot}%{_datadir}/GeoIP +install -m 0755 -vd %{buildroot}%{_datadir}/GeoIP # Install the cron script for fetching weekly updates -install -D -m 755 %{SOURCE1} %{buildroot}%{_sysconfdir}/cron.weekly/geoipupdate +install -m 0755 -vd %{buildroot}%{_sysconfdir}/cron.weekly +install -m 0755 -vp %{S:3} %{buildroot}%{_sysconfdir}/cron.weekly/geoipupdate # Install the manpages -install -d %{buildroot}%{_mandir}/man1 -install -p -m 0644 _build/geoipupdate.1 %{buildroot}%{_mandir}/man1/geoipupdate.1 -install -d %{buildroot}%{_mandir}/man5 -install -p -m 0644 _build/GeoIP.conf.5 %{buildroot}%{_mandir}/man5/GeoIP.conf.5 +install -m 0755 -vd %{buildroot}%{_mandir}/man1 +install -m 0644 -vp _build/geoipupdate.1 %{buildroot}%{_mandir}/man1/geoipupdate.1 +install -m 0755 -vd %{buildroot}%{_mandir}/man5 +install -m 0644 -vp _build/GeoIP.conf.5 %{buildroot}%{_mandir}/man5/GeoIP.conf.5 -%if %{with check} %check -%gocheck +%go_vendor_license_check -c %{S:2} +%if %{with check} +%gotest ./... %endif -%files -%license LICENSE-APACHE LICENSE-MIT -%doc conf/GeoIP.conf.default README.md CHANGELOG.md -%doc doc/GeoIP.conf.md doc/geoipupdate.md -%config(noreplace) %{_sysconfdir}/GeoIP.conf +%files -f %{go_vendor_license_filelist} +%license vendor/modules.txt +%doc doc CHANGELOG.md README.dev.md README.md %{_bindir}/geoipupdate +%config(noreplace) %{_sysconfdir}/GeoIP.conf %dir %{_datadir}/GeoIP/ %{_mandir}/man1/geoipupdate.1* %{_mandir}/man5/GeoIP.conf.5* @@ -107,6 +114,9 @@ install -p -m 0644 _build/GeoIP.conf.5 %{buildroot}%{_mandir}/man5/GeoIP.conf.5 %config(noreplace) %{_sysconfdir}/cron.weekly/geoipupdate %changelog +* Sun Oct 19 2025 Robert-André Mauchin - 7.1.1-5 +- Convert to new vendoring guidelines + * Fri Oct 10 2025 Alejandro Sáez - 7.1.1-4 - rebuild diff --git a/go-vendor-tools.toml b/go-vendor-tools.toml new file mode 100644 index 0000000..2c22c5e --- /dev/null +++ b/go-vendor-tools.toml @@ -0,0 +1,8 @@ +[archive] + +[licensing] +detector = "askalono" +[[licensing.licenses]] +path = "vendor/gopkg.in/yaml.v3/LICENSE" +sha256sum = "d18f6323b71b0b768bb5e9616e36da390fbd39369a81807cca352de4e4e6aa0b" +expression = "MIT AND (MIT AND Apache-2.0)" diff --git a/sources b/sources index 9f3552b..d7f4e69 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ +SHA512 (geoipupdate-7.1.1-vendor.tar.bz2) = 7a107d8158416f9a42c6df7ac542aa7609183717e88bce9f40c6dc4b151a5eec0783cccc53403b0fef15c8bdf78724bf2b85f4242d939e90f3a09689971faf05 SHA512 (geoipupdate-7.1.1.tar.gz) = 9be4c7db231b453d3583f9130edb3f8eafac73af44a82bf4778e59592a105c6ccd48446ae9193046bd427c178fef9a9a3ea36baee1d4b04389450b5fbad4dc7e From 60545ed742de6302112bfdc2b02b55d23396ade0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Mon, 6 Oct 2025 06:55:49 +0200 Subject: [PATCH 47/48] Add Packit integration for maintenance --- .packit.yaml | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 .packit.yaml diff --git a/.packit.yaml b/.packit.yaml new file mode 100644 index 0000000..ec2d521 --- /dev/null +++ b/.packit.yaml @@ -0,0 +1,35 @@ +specfile_path: geoipupdate.spec + +upstream_package_name: geoipupdate +upstream_project_url: https://github.com/maxmind/geoipupdate +downstream_package_name: geoipupdate + +upstream_tag_template: v{version} + +jobs: + +- job: pull_from_upstream + trigger: release + dist_git_branches: + - rawhide + +- job: koji_build + trigger: commit + dist_git_branches: + - rawhide + +actions: + post-modifications: + # https://fedora.gitlab.io/sigs/go/go-vendor-tools/scenarios/#manual-update + - | + sh -xeuc " + cd $PACKIT_DOWNSTREAM_REPO + export GOTOOLCHAIN=auto + go_vendor_archive create --config go-vendor-tools.toml geoipupdate.spec + go_vendor_license \ + --config go-vendor-tools.toml \ + --path geoipupdate.spec \ + report \ + --verify-spec + " +create_sync_note: false From c5f6854232a432d7561304bcdb061bd1b56f85eb Mon Sep 17 00:00:00 2001 From: Paul Howarth Date: Mon, 20 Oct 2025 13:36:05 +0100 Subject: [PATCH 48/48] Tidy up after merging PR for new vendoring guidelines https://src.fedoraproject.org/rpms/geoipupdate/pull-request/1 * Remove duplicate Name/Release/Summary tags * Remove use of tabs for whitespace consistency * Drop redundant %autopatch * Update rpmlintrc for new warnings --- geoipupdate.rpmlintrc | 10 +++++++-- geoipupdate.spec | 47 +++++++++++++++++++------------------------ 2 files changed, 29 insertions(+), 28 deletions(-) diff --git a/geoipupdate.rpmlintrc b/geoipupdate.rpmlintrc index cf120c1..b602642 100644 --- a/geoipupdate.rpmlintrc +++ b/geoipupdate.rpmlintrc @@ -1,5 +1,3 @@ -from Config import * - # Documentation for cron packages is the package %description addFilter("no-documentation") @@ -8,3 +6,11 @@ addFilter("executable-marked-as-config-file /etc/cron.weekly/geoipupdate") # geoipupdate-cron6 is obsolete (upstream stopped providing free IPv6 databases) and not replaced addFilter("obsolete-not-provided geoipupdate-cron6") + +# Consequence of vendoring dependencies +addFilter("invalid-url Source1: geoipupdate-.*-vendor.tar.bz2") + +# Nobody will ever have separate filesystems for subdirectories here +addFilter("cross-directory-hard-link /usr/share/licenses/geoipupdate/vendor/.*/LICENSE /usr/share/licenses/geoipupdate/vendor/.*/LICENSE") +addFilter("cross-directory-hard-link /usr/share/licenses/geoipupdate/vendor/.*/PATENTS /usr/share/licenses/geoipupdate/vendor/.*/PATENTS") + diff --git a/geoipupdate.spec b/geoipupdate.spec index 5778bc8..03bf648 100644 --- a/geoipupdate.spec +++ b/geoipupdate.spec @@ -2,17 +2,13 @@ %bcond check 1 # https://github.com/maxmind/geoipupdate -%global goipath github.com/maxmind/geoipupdate/v7 -Version: 7.1.1 +%global goipath github.com/maxmind/geoipupdate/v7 +Version: 7.1.1 %gometa -L -f -Name: geoipupdate -Release: 5%{?dist} -Summary: Update GeoIP2 binary databases from MaxMind - Name: geoipupdate -Release: %autorelease +Release: 5%{?dist} Summary: Update GeoIP2 binary databases from MaxMind # Generated by go-vendor-tools @@ -22,32 +18,32 @@ Source0: %{gosource} # Generated by go-vendor-tools Source1: %{archivename}-vendor.tar.bz2 Source2: go-vendor-tools.toml -Source3: geoipupdate.cron +Source3: geoipupdate.cron -BuildRequires: coreutils -BuildRequires: crontabs +BuildRequires: coreutils +BuildRequires: crontabs BuildRequires: go-vendor-tools -BuildRequires: make -BuildRequires: pandoc -BuildRequires: perl-interpreter -BuildRequires: perl(File::Temp) -BuildRequires: perl(strict) -BuildRequires: perl(warnings) -BuildRequires: sed +BuildRequires: make +BuildRequires: pandoc +BuildRequires: perl-interpreter +BuildRequires: perl(File::Temp) +BuildRequires: perl(strict) +BuildRequires: perl(warnings) +BuildRequires: sed # Legacy databases fetched by cron6 sub-package no longer available -Obsoletes: geoipupdate-cron6 < %{version}-%{release} +Obsoletes: geoipupdate-cron6 < %{version}-%{release} %description The GeoIP Update program performs automatic updates of GeoIP2 binary databases. %package cron -Summary: Cron job to do weekly updates of GeoIP databases -BuildArch: noarch -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: crontabs -Obsoletes: GeoIP-update < 1.6.0 -Provides: GeoIP-update = 1.6.0 +Summary: Cron job to do weekly updates of GeoIP databases +BuildArch: noarch +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: crontabs +Obsoletes: GeoIP-update < 1.6.0 +Provides: GeoIP-update = 1.6.0 %description cron Cron job for weekly updates to GeoIP2 binary databases from MaxMind. @@ -55,7 +51,6 @@ Cron job for weekly updates to GeoIP2 binary databases from MaxMind. %prep %goprep -A %setup -q -T -D -a1 %{forgesetupargs} -%autopatch -p1 %generate_buildrequires %go_vendor_license_buildrequires -c %{S:2} @@ -118,7 +113,7 @@ install -m 0644 -vp _build/GeoIP.conf.5 %{buildroot}%{_mandir}/man5/GeoIP.co - Convert to new vendoring guidelines * Fri Oct 10 2025 Alejandro Sáez - 7.1.1-4 -- rebuild +- Rebuild * Fri Aug 15 2025 Maxwell G - 7.1.1-3 - Rebuild for golang-1.25.0