[arch-commits] Commit in geoip-database/trunk (PKGBUILD check-last-modified.sh)

Evangelos Foutras foutrelis at archlinux.org
Thu May 7 07:07:16 UTC 2020


    Date: Thursday, May 7, 2020 @ 07:07:15
  Author: foutrelis
Revision: 382633

upgpkg: geoip-database 20200507-1: switch to unofficial upstream

Last official update by MaxMind was on March 2018. These are converted
databases from the newer GeoLite2 format. Use these until everyone has
migrated to libmaxminddb and we can finally drop extra/geoip.

Modified:
  geoip-database/trunk/PKGBUILD
Deleted:
  geoip-database/trunk/check-last-modified.sh

------------------------+
 PKGBUILD               |   61 +++++++++++++++++------------------------------
 check-last-modified.sh |   26 --------------------
 2 files changed, 23 insertions(+), 64 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-07 06:57:14 UTC (rev 382632)
+++ PKGBUILD	2020-05-07 07:07:15 UTC (rev 382633)
@@ -1,40 +1,29 @@
 # Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
 
 pkgname=('geoip-database' 'geoip-database-extra')
-pkgver=20180403
+pkgver=20200507
 pkgrel=1
 arch=('any')
-url="https://dev.maxmind.com/geoip/legacy/geolite/"
-license=('custom:OPEN DATA LICENSE')
+url="https://mailfud.org/geoip-legacy/"
+license=('CCPL:by-sa')
+makedepends=('util-linux')
 checkdepends=('geoip')
-source=(GeoIP-$pkgver.dat.gz::https://geolite.maxmind.com/download/geoip/database/GeoLiteCountry/GeoIP.dat.gz
-        GeoIPv6-$pkgver.dat.gz::https://geolite.maxmind.com/download/geoip/database/GeoIPv6.dat.gz
-        GeoLiteCity-$pkgver.dat.gz::https://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz
-        GeoLiteCityv6-$pkgver.dat.gz::https://geolite.maxmind.com/download/geoip/database/GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz
-        GeoIPASNum-$pkgver.dat.gz::https://download.maxmind.com/download/geoip/database/asnum/GeoIPASNum.dat.gz
-        GeoIPASNumv6-$pkgver.dat.gz::https://download.maxmind.com/download/geoip/database/asnum/GeoIPASNumv6.dat.gz
-        GeoIP-LICENSE.txt::https://geolite.maxmind.com/download/geoip/database/LICENSE.txt)
-noextract=(GeoIP-$pkgver.dat.gz
-           GeoIPv6-$pkgver.dat.gz
-           GeoLiteCity-$pkgver.dat.gz
-           GeoLiteCityv6-$pkgver.dat.gz
-           GeoIPASNum-$pkgver.dat.gz
-           GeoIPASNumv6-$pkgver.dat.gz)
-sha256sums=('b9c05eb8bfcf90a6ddfdc6815caf40a8db2710f0ce3dd48fbd6c24d485ae0449'
-            '1072c972cb079871a774f333bfd12117a21c10552dc84ef147d400727b3ef79c'
-            '90db2e52195e3d1bcdb2c2789209006d09de5c742812dbd9a1b36c12675ec4cd'
-            'fc93d461a80ba7452ffb9f166c1d82e6df27886a11faeafb32f6dcb741c3503c'
-            '3bbe69a4f8d00c9c9ba24c0d9b40146e40ed8125f083a236e1069eaabc41f7f5'
-            '502f7de4b4790ffd36fd9cb1bca1354130c45095ed0623a1d4648a7839326299'
-            '83a4cb82ef8953c0107886b49bc39fcf77590a222d30e778d48f5d92f5b5e383')
+source=(GeoIP-$pkgver.dat.gz::https://mailfud.org/geoip-legacy/GeoIP.dat.gz
+        GeoIPv6-$pkgver.dat.gz::https://mailfud.org/geoip-legacy/GeoIPv6.dat.gz
+        GeoIPCity-$pkgver.dat.gz::https://mailfud.org/geoip-legacy/GeoIPCity.dat.gz
+        GeoIPCityv6-$pkgver.dat.gz::https://mailfud.org/geoip-legacy/GeoIPCityv6.dat.gz
+        GeoIPASNum-$pkgver.dat.gz::https://mailfud.org/geoip-legacy/GeoIPASNum.dat.gz
+        GeoIPASNumv6-$pkgver.dat.gz::https://mailfud.org/geoip-legacy/GeoIPASNumv6.dat.gz)
+sha256sums=('5ede20bf8d2ed9b5b1d9b6c1f5629485f2c5cbaaa7d4b5f5e109bf4988c4ac1a'
+            'e08315f7d6ebef446edce332c7c10850aa3b13318b0dca2b41a667f2264e4017'
+            'a66cfc0d48007c1c1b905419662785d7dd919286db9fbb2e824fa4545c2a0a31'
+            'ce1bdf1c1dc0cce41de6bac173b7338f5f9873c0e531a660168752cd18937c1d'
+            'c53dbc43af4186ca8a1515ffc16c82d70c54b4a12e135addc659f7e1bbf8eb96'
+            'b2bfe48257a778d2fd8cf2327d8782dbe5b03a56cb42ae8e6d42a2dc932c1066')
 
 prepare() {
   cd "$srcdir"
-
-  for _database_name in GeoIP GeoLiteCity GeoIPASNum; do
-    gunzip -c $_database_name-$pkgver.dat.gz >${_database_name/GeoLite/GeoIP}.dat
-    gunzip -c ${_database_name}v6-$pkgver.dat.gz >${_database_name/GeoLite/GeoIP}v6.dat
-  done
+  rename -v -- "-$pkgver" '' *.dat
 }
 
 check() {
@@ -50,22 +39,22 @@
     return 1
   fi
 
-  if [[ $(geoiplookup -f GeoIPCity.dat 8.8.8.8) != *'US, N/A, N/A'* ]]; then
+  if [[ $(geoiplookup -f GeoIPCity.dat 8.8.8.8) != *'US, 00, N/A, N/A'* ]]; then
     error 'Unable to resolve IPv4 address to city.'
     return 1
   fi
 
-  if [[ $(geoiplookup6 -f GeoIPCityv6.dat 2001:4860:4860::8888) != *'US, N/A, N/A'* ]]; then
+  if [[ $(geoiplookup6 -f GeoIPCityv6.dat 2001:4860:4860::8888) != *'US, 00, N/A, N/A'* ]]; then
     error 'Unable to resolve IPv6 address to city.'
     return 1
   fi
 
-  if [[ $(geoiplookup -f GeoIPASNum.dat 8.8.8.8) != *'AS15169 Google LLC' ]]; then
+  if [[ $(geoiplookup -f GeoIPASNum.dat 8.8.8.8) != *'AS15169 GOOGLE' ]]; then
     error 'Unable to resolve IPv4 address to ASN.'
     return 1
   fi
 
-  if [[ $(geoiplookup6 -f GeoIPASNumv6.dat 2001:4860:4860::8888) != *'AS15169 Google LLC' ]]; then
+  if [[ $(geoiplookup6 -f GeoIPASNumv6.dat 2001:4860:4860::8888) != *'AS15169 GOOGLE' ]]; then
     error 'Unable to resolve IPv6 address to ASN.'
     return 1
   fi
@@ -72,25 +61,21 @@
 }
 
 package_geoip-database() {
-  pkgdesc="GeoLite country geolocation database compiled by MaxMind"
+  pkgdesc="GeoIP legacy country database"
 
   cd "$srcdir"
 
   install -d "$pkgdir/usr/share/GeoIP"
   install -m644 -t "$pkgdir/usr/share/GeoIP" GeoIP{,v6}.dat
-
-  install -Dm644 GeoIP-LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE.txt"
 }
 
 package_geoip-database-extra() {
-  pkgdesc="GeoLite city/ASN geolocation databases compiled by MaxMind"
+  pkgdesc="GeoIP legacy city/ASN databases"
 
   cd "$srcdir"
 
   install -d "$pkgdir/usr/share/GeoIP"
   install -m644 -t "$pkgdir/usr/share/GeoIP" GeoIPCity{,v6}.dat GeoIPASNum{,v6}.dat
-
-  install -Dm644 GeoIP-LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE.txt"
 }
 
 # vim:set ts=2 sw=2 et:

Deleted: check-last-modified.sh
===================================================================
--- check-last-modified.sh	2020-05-07 06:57:14 UTC (rev 382632)
+++ check-last-modified.sh	2020-05-07 07:07:15 UTC (rev 382633)
@@ -1,26 +0,0 @@
-#!/bin/bash -e
-
-# Unicode characters taken from pactree.c
-UNICODE_IS_FUN="\u2514\u2500"
-
-verbose=0
-if [[ $1 == -v ]]; then
-	verbose=1
-fi
-
-URLS=(https://geolite.maxmind.com/download/geoip/database/GeoLiteCountry/GeoIP.dat.gz
-      https://geolite.maxmind.com/download/geoip/database/GeoIPv6.dat.gz
-      https://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz
-      https://geolite.maxmind.com/download/geoip/database/GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz
-      https://download.maxmind.com/download/geoip/database/asnum/GeoIPASNum.dat.gz
-      https://download.maxmind.com/download/geoip/database/asnum/GeoIPASNumv6.dat.gz)
-
-for url in ${URLS[@]}; do
-	last_mod=$(curl -sI $url | grep -i ^Last-Modified: | cut -d' ' -f2- | tr -d '\r')
-	echo "$last_mod (${url##*/})"
-
-	if ((verbose)); then
-		build_id=$(curl -s $url | gzip -cd | grep -aoE '[0-9]{8} Build [0-9]*')
-		echo -e "${UNICODE_IS_FUN}$build_id"
-	fi
-done



More information about the arch-commits mailing list