Changed to version 4.2.2

5 files changed, 184 insertions, 38 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b11a71897d5c..b47c8e369ea3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,20 @@
 pkgbase = geoipupdate
-	pkgdesc = Automatic updates of MaxMind GeoIP2 and GeoIP Legacy binary databases
-	pkgver = 2.2.1
+	pkgdesc = The GeoIP Update program performs automatic updates of GeoIP2 and GeoIP Legacy binary databases.
+	pkgver = 4.2.2
 	pkgrel = 1
-	url = http://dev.maxmind.com/geoip/geoipupdate/
+	url = http://dev.maxmind.com/geoip/geoipupdate
 	install = geoipupdate.install
-	arch = i686
+	changelog = geoipupdate.changelog
 	arch = x86_64
-	license = GPL2
-	depends = curl
+	license = Apache
 	provides = geoipupdate
-	source = https://github.com/maxmind/geoipupdate/releases/download/v2.2.1/geoipupdate-2.2.1.tar.gz
+	source = https://github.com/maxmind/geoipupdate/releases/download/v4.2.2/geoipupdate_4.2.2_linux_amd64.tar.gz
 	source = geoipupdate.install
 	source = geoipupdate.service
 	source = geoipupdate.timer
-	sha512sums = 5d28803353badd4d00a9174202912524f31e057ef4f5381360c16909fbccce3033f5ad7ec9c55963b70c0bbdb74589932bde36ea9b34f2a0632c504c1718dd85
-	sha512sums = 660d22d5dc86d6c2a30456e72b6d121d093d40fc1e27f8250d33675b4752c5bb66aef371a17a7177a926df27a7149bc63118248c6048078e861ce420bd875583
-	sha512sums = 20eba13c38f54fb32dc3ed6535c4ab62a7292b0f638d03c9ab5b3d3d968e4324795953fe0ec1596e3e69b279e8de24a5608f1484d68dd9b5d35f11a56b1dbd72
+	sha512sums = cd946f05ace71ddfc368db00dd4d3ae378f6ac311cf7d7af7afb6fa6420ba50d2a0e1bdce42ad53e2ae8ef1e1644c47ba405859e31f335e0265ff3babbc6a5ab
+	sha512sums = 9283bffa892889a406c5c80d8d08a127de0d65015352d71bc6444f3c83724b2baf9e7ae77690b1fd0070c8fb9ff921b235d17ebaa832e26b79237b314d5a527b
+	sha512sums = 8eac86cdaac1796548b1cad24a6dcfbf8dd7a410eefd9dec74fc9775248f1a6fe68be0fd2b8ffcc6b5ab74380d988a7407b3cf889aee32d43ca79ad3a3686aab
 	sha512sums = 1d865e31eccd7597093df83da05f3866a361e9f68bcc1f1fa10d72cc2fae8a789d9c2cee445cf81f2384a3415ebd12d2c485d6dfe8401ea005f7c111a6331dd2
 
 pkgname = geoipupdate
diff --git a/PKGBUILD b/PKGBUILD
index fd33a794a690..ebbfdb22b7bf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,37 +1,57 @@
-# Maintainer: frank AT apsu DOT be
+# Maintainer: Laszlo Malina <laszlo.malina at domaintank dot hu>
+# Contributor: silvermonk <frank AT apsu DOT be>
+
 pkgname=geoipupdate
-pkgver=2.2.1
+pkgver=4.2.2
 pkgrel=1
-pkgdesc="Automatic updates of MaxMind GeoIP2 and GeoIP Legacy binary databases"
-license=('GPL2')
-arch=(i686 x86_64)
-url="http://dev.maxmind.com/geoip/geoipupdate/"
-
-depends=(curl)
+pkgdesc="The GeoIP Update program performs automatic updates of GeoIP2 and GeoIP Legacy binary databases."
+license=('Apache')
+arch=('x86_64')
+url="http://dev.maxmind.com/geoip/geoipupdate"
+changelog=$pkgname.changelog
 provides=(geoipupdate)
 install=geoipupdate.install
 
-source=("https://github.com/maxmind/geoipupdate/releases/download/v$pkgver/geoipupdate-$pkgver.tar.gz"
-	    "geoipupdate.install"
-        "geoipupdate.service"
-        "geoipupdate.timer"
+source=(
+    "https://github.com/maxmind/geoipupdate/releases/download/v${pkgver}/geoipupdate_${pkgver}_linux_amd64.tar.gz"
+    "geoipupdate.install"
+    "geoipupdate.service"
+    "geoipupdate.timer"
+)
+
+sha512sums=(
+    'cd946f05ace71ddfc368db00dd4d3ae378f6ac311cf7d7af7afb6fa6420ba50d2a0e1bdce42ad53e2ae8ef1e1644c47ba405859e31f335e0265ff3babbc6a5ab'
+    '9283bffa892889a406c5c80d8d08a127de0d65015352d71bc6444f3c83724b2baf9e7ae77690b1fd0070c8fb9ff921b235d17ebaa832e26b79237b314d5a527b'
+    '8eac86cdaac1796548b1cad24a6dcfbf8dd7a410eefd9dec74fc9775248f1a6fe68be0fd2b8ffcc6b5ab74380d988a7407b3cf889aee32d43ca79ad3a3686aab'
+    '1d865e31eccd7597093df83da05f3866a361e9f68bcc1f1fa10d72cc2fae8a789d9c2cee445cf81f2384a3415ebd12d2c485d6dfe8401ea005f7c111a6331dd2'
 )
 
-sha512sums=('5d28803353badd4d00a9174202912524f31e057ef4f5381360c16909fbccce3033f5ad7ec9c55963b70c0bbdb74589932bde36ea9b34f2a0632c504c1718dd85'
-            '660d22d5dc86d6c2a30456e72b6d121d093d40fc1e27f8250d33675b4752c5bb66aef371a17a7177a926df27a7149bc63118248c6048078e861ce420bd875583'
-            '20eba13c38f54fb32dc3ed6535c4ab62a7292b0f638d03c9ab5b3d3d968e4324795953fe0ec1596e3e69b279e8de24a5608f1484d68dd9b5d35f11a56b1dbd72'
-            '1d865e31eccd7597093df83da05f3866a361e9f68bcc1f1fa10d72cc2fae8a789d9c2cee445cf81f2384a3415ebd12d2c485d6dfe8401ea005f7c111a6331dd2')
 
 build() {
-	cd "$srcdir/geoipupdate-$pkgver"
-	./configure --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib  --sysconfdir=/etc/geoipupdate
-	make
+  softdir="$srcdir/geoipupdate_${pkgver}_linux_amd64"
+  sed -i 's/# DatabaseDirectory \/usr\/local\/share\/GeoIP/DatabaseDirectory \/usr\/share\/GeoIP/g' "$softdir/GeoIP.conf"
+  sed -i 's/# LockFile \/usr\/local\/share\/GeoIP\/\.geoipupdate\.lock/LockFile \/usr\/share\/GeoIP\/\.geoipupdate\.lock/g' "$softdir/GeoIP.conf"
 }
 
 package() {
-	cd "$srcdir/geoipupdate-$pkgver"
-    make PREFIX=/usr DESTDIR="$pkgdir" install
+    softdir="$srcdir/geoipupdate_${pkgver}_linux_amd64"
+    cd $softdir
+
+    mkdir -p "$pkgdir/etc"
     mkdir -p "$pkgdir/usr/lib/systemd/system"
+    mkdir -p "$pkgdir/usr/bin"
+    mkdir -p "$pkgdir/usr/share/GeoIP"
+    mkdir -p "$pkgdir/usr/share/doc/geoipupdate"
+
+    cp "$softdir/geoipupdate" "$pkgdir/usr/bin/"
+    cp "$softdir/GeoIP.conf" "$pkgdir/etc/"
     cp "$srcdir/geoipupdate.service" "$pkgdir/usr/lib/systemd/system/"
     cp "$srcdir/geoipupdate.timer"   "$pkgdir/usr/lib/systemd/system/"
+
+    cp "$softdir/CHANGELOG.md"   "$pkgdir/usr/share/doc/geoipupdate/"
+    cp "$softdir/GeoIP.conf"   "$pkgdir/usr/share/doc/geoipupdate/"
+    cp "$softdir/GeoIP.conf.md"   "$pkgdir/usr/share/doc/geoipupdate/"
+    cp "$softdir/LICENSE-APACHE"   "$pkgdir/usr/share/doc/geoipupdate/"
+    cp "$softdir/LICENSE-MIT"   "$pkgdir/usr/share/doc/geoipupdate/"
+    cp "$softdir/geoipupdate.md"   "$pkgdir/usr/share/doc/geoipupdate/"
 }
diff --git a/geoipupdate.changelog b/geoipupdate.changelog
new file mode 100644
index 000000000000..00d3abf0359f
--- /dev/null
+++ b/geoipupdate.changelog
@@ -0,0 +1,109 @@
+# CHANGELOG
+
+## 4.2.2 (2020-02-21)
+
+* Re-release for PPA. No other changes.
+
+## 4.2.1 (2020-02-21)
+
+* The minimum Go version is now 1.10 again as this was needed to build the PPA
+  packages.
+
+## 4.2.0 (2020-02-20)
+
+* 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. Reported by Roman Glushko. GitHub #81.
+* The minimum Go version is now 1.13.
+* 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. Reported by Ilya Skrypitsa and
+  pgnd. GitHub #69 and #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`. Reported by neonknight. GitHub #76.
+
+## 4.1.5 (2019-11-08)
+
+* 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.
+
+## 4.1.4 (2019-11-07)
+
+* Re-release of 4.1.3 as two commits were missing. No changes.
+
+## 4.1.3 (2019-11-07)
+
+* Remove formatting, linting, and testing from the geoipupdate target in
+  the Makefile.
+
+## 4.1.2 (2019-11-07)
+
+* Re-release of 4.1.1 to fix Ubuntu PPA release issue. No code changes.
+
+## 4.1.1 (2019-11-07)
+
+* Re-release of 4.1.0 to fix Ubuntu PPA release issue. No code changes.
+
+## 4.1.0 (2019-11-07)
+
+* Improve man page formatting and organization. Pull request by Faidon
+  Liambotis. GitHub #44.
+* Provide update functionality as an importable package as well as a
+  standalone program. Pull request by amzhughe. GitHub #48.
+
+## 4.0.6 (2019-09-13)
+
+* Re-release of 4.0.5 to fix Ubuntu PPA release issue. No code changes.
+
+## 4.0.5 (2019-09-13)
+
+* Ignore errors when syncing file system. These errors were primarily due
+  to the file system not supporting the sync call. Reported by devkappa.
+  GitHub #37.
+* Use CRLF line endings on Windows for text files.
+* Fix tests on Windows.
+* Improve man page formatting. Reported by Faidon Liambotis. GitHub #38.
+* Dependencies are no longer vendored. Reported by Faidon Liambotis. GitHub
+  #39.
+
+## 4.0.4 (2019-08-30)
+
+* 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. Pull
+  request by Nicholi. GitHub #32.
+
+## 4.0.3 (2019-06-07)
+
+* Update flock dependency from `theckman/go-flock` to `gofrs/flock`. Pull
+  request by Paul Howarth. GitHub #22.
+* Switch to Go modules and update dependencies.
+* Fix version output on Ubuntu PPA and Homebrew releases.
+
+## 4.0.2 (2019-01-18)
+
+* Fix dependency in `Makefile`.
+
+## 4.0.1 (2019-01-17)
+
+* Improve documentation.
+* Add script to generate man pages to `Makefile`.
+
+## 4.0.0 (2019-01-14)
+
+* Expand installation instructions.
+* First full release.
+
+## 0.0.2 (2018-11-28)
+
+* Fix the output when the version output, `-V`, is passed to `geoipupdate`.
+
+## 0.0.1 (2018-11-27)
+
+* Initial version
diff --git a/geoipupdate.install b/geoipupdate.install
index e73ec8c45463..94ec0c0394c6 100644
--- a/geoipupdate.install
+++ b/geoipupdate.install
@@ -2,11 +2,31 @@ post_install() {
 	cat <<EOF
 **** NOTICE ****
 *
-* To use the geoipupdate package,
-* you need to add configuration data to /etc/geoipupdate/GeoIP.conf.
-*
+* To use the geoipupdate package, you need to add configuration data to /etc/GeoIP.conf.
 * Please See <http://dev.maxmind.com/geoip/geoipupdate/>
 *
+* To use the program, you must specify the following in the configuration file: AccountID, LicenseKey, EditionIDs.
+*
+* If you do not have these you will need a MaxMind registration: on December 30th, 2019, MaxMind started 
+* requiring free accounts to access the free Geolite2 databases, in order to comply with various privacy regulations.
+* Please see <https://blog.maxmind.com/2019/12/18/significant-changes-to-accessing-and-using-geolite2-databases/>
+
+* Start by registering for a free GeoLite2 account, and signing in:
+* <https://www.maxmind.com/en/geolite2/signup>
+
+* After successful registration and login navigate the to the License Keys page under your account, and create 
+* a new license key for the version of geoipupdate that was installed.
+*
+* Once you have generated a key, download the config pre-filled configuration file. This file should be saved at /etc/GeoIP.conf,
+* rather, just copy the three required variables mentioned above into your existing configuration file.
+*
+* Then you can run it first to download the databases for the first time.
+*
+* $ sudo geoipupdate --config-file /etc/GeoIP.conf
+
+* The GeoLite2 Country, City, and ASN databases are updated weekly, every Tuesday.
+* (This information may be outdated. This information may be outdated. If the exact time of the update is important, please take a look.)
+* 
 * To schedule automatic updates, start and enable
 *
 * geoipupdate.timer
@@ -14,9 +34,7 @@ post_install() {
 * $ sudo systemctl start geoipupdate.timer
 * $ sudo systemctl enable geoipupdate.timer
 *
-* by default, this will run geoipupdate weekly, and one minute
-* after every reboot.
-* 
+* by default, this will run geoipupdate weekly, and one minute after every reboot.
 *
 EOF
 }
diff --git a/geoipupdate.service b/geoipupdate.service
index d49d4d12117a..93bd6533452a 100644
--- a/geoipupdate.service
+++ b/geoipupdate.service
@@ -5,7 +5,7 @@ After=network.target
 
 [Service]
 Type=oneshot
-ExecStart=/usr/bin/geoipupdate
+ExecStart=/usr/bin/geoipupdate --config-file /etc/GeoIP.conf
 
 [Install]
 WantedBy=multi-user.target