Date: Tuesday, April 10, 2018 @ 07:23:01 Author: foutrelis Revision: 321433
archrelease: copy trunk to extra-any Added: geoip-database/repos/extra-any/PKGBUILD (from rev 321432, geoip-database/trunk/PKGBUILD) geoip-database/repos/extra-any/check-last-modified.sh (from rev 321432, geoip-database/trunk/check-last-modified.sh) Deleted: geoip-database/repos/extra-any/PKGBUILD geoip-database/repos/extra-any/check-last-modified.sh ------------------------+ PKGBUILD | 194 +++++++++++++++++++++++------------------------ check-last-modified.sh | 52 ++++++------ 2 files changed, 123 insertions(+), 123 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2018-04-10 07:22:53 UTC (rev 321432) +++ PKGBUILD 2018-04-10 07:23:01 UTC (rev 321433) @@ -1,97 +0,0 @@ -# $Id$ -# Maintainer: Evangelos Foutras <evange...@foutrelis.com> - -pkgname=('geoip-database' 'geoip-database-extra') -pkgver=20180306 -pkgrel=1 -arch=('any') -url="https://dev.maxmind.com/geoip/legacy/geolite/" -license=('custom:OPEN DATA LICENSE') -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=('ddc1fd3534ecc9351f51ae9fb42d5524647c03d203c9122ea5354114d0f6c191' - '4c70c42096b94d41bcde46eea480d1812a277e0ceb38c6881ffb465f1b517361' - 'b45ca078b62dc3868ecf38d6ec5b7cc49dc6c7e96640d14fb4bc767e3777619a' - '296b90ca0db0365f13eb43cfa30dcdd566403cc985fec8e2949336bc41eb4533' - '752c7cdddc682eb021dcf13cfe7dd74559d84c2335ffca5c096dfe543f7e5933' - 'c9bba23c479035c4d9f15fd236e5bb916d6036043801b7e2656dbf3fd41807df' - '83a4cb82ef8953c0107886b49bc39fcf77590a222d30e778d48f5d92f5b5e383') - -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 -} - -check() { - cd "$srcdir" - - if [[ $(geoiplookup -f GeoIP.dat 8.8.8.8) != *'US, United States' ]]; then - error 'Unable to resolve IPv4 address to country.' - return 1 - fi - - if [[ $(geoiplookup6 -f GeoIPv6.dat 2001:4860:4860::8888) != *'US, United States' ]]; then - error 'Unable to resolve IPv6 address to country.' - return 1 - fi - - if [[ $(geoiplookup -f GeoIPCity.dat 8.8.8.8) != *'US, 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 - error 'Unable to resolve IPv6 address to city.' - return 1 - fi - - if [[ $(geoiplookup -f GeoIPASNum.dat 8.8.8.8) != *'AS15169 Google LLC' ]]; 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 - error 'Unable to resolve IPv6 address to ASN.' - return 1 - fi -} - -package_geoip-database() { - pkgdesc="GeoLite country geolocation database compiled by MaxMind" - - 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" - - 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: Copied: geoip-database/repos/extra-any/PKGBUILD (from rev 321432, geoip-database/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2018-04-10 07:23:01 UTC (rev 321433) @@ -0,0 +1,97 @@ +# $Id$ +# Maintainer: Evangelos Foutras <evange...@foutrelis.com> + +pkgname=('geoip-database' 'geoip-database-extra') +pkgver=20180403 +pkgrel=1 +arch=('any') +url="https://dev.maxmind.com/geoip/legacy/geolite/" +license=('custom:OPEN DATA LICENSE') +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') + +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 +} + +check() { + cd "$srcdir" + + if [[ $(geoiplookup -f GeoIP.dat 8.8.8.8) != *'US, United States' ]]; then + error 'Unable to resolve IPv4 address to country.' + return 1 + fi + + if [[ $(geoiplookup6 -f GeoIPv6.dat 2001:4860:4860::8888) != *'US, United States' ]]; then + error 'Unable to resolve IPv6 address to country.' + return 1 + fi + + if [[ $(geoiplookup -f GeoIPCity.dat 8.8.8.8) != *'US, 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 + error 'Unable to resolve IPv6 address to city.' + return 1 + fi + + if [[ $(geoiplookup -f GeoIPASNum.dat 8.8.8.8) != *'AS15169 Google LLC' ]]; 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 + error 'Unable to resolve IPv6 address to ASN.' + return 1 + fi +} + +package_geoip-database() { + pkgdesc="GeoLite country geolocation database compiled by MaxMind" + + 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" + + 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 2018-04-10 07:22:53 UTC (rev 321432) +++ check-last-modified.sh 2018-04-10 07:23:01 UTC (rev 321433) @@ -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 Copied: geoip-database/repos/extra-any/check-last-modified.sh (from rev 321432, geoip-database/trunk/check-last-modified.sh) =================================================================== --- check-last-modified.sh (rev 0) +++ check-last-modified.sh 2018-04-10 07:23:01 UTC (rev 321433) @@ -0,0 +1,26 @@ +#!/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