Date: Wednesday, May 10, 2017 @ 21:23:36 Author: foutrelis Revision: 295571
archrelease: copy trunk to extra-any Added: geoip-database/repos/extra-any/PKGBUILD (from rev 295570, geoip-database/trunk/PKGBUILD) geoip-database/repos/extra-any/check-last-modified.sh (from rev 295570, 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 2017-05-10 21:23:28 UTC (rev 295570) +++ PKGBUILD 2017-05-10 21:23:36 UTC (rev 295571) @@ -1,97 +0,0 @@ -# $Id$ -# Maintainer: Evangelos Foutras <evange...@foutrelis.com> - -pkgname=('geoip-database' 'geoip-database-extra') -pkgver=20170404 -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=('fd9136a0feaa0fc0e24d2a72636bd3de7961263291d6d678a869f9644476390c' - '6dcc3e1e34b9dc78c95bd0488bbfd732f2efdfb8c701d0c3c3f4075492904984' - 'b4464f8695a72a011a51da910a4d2a7e3c2440d7d988fd4f19a7976072a4cb61' - '8ccb89d1b605705fc909c62d75c508adea764290223aa09aa472471f6a5c6719' - 'f78c9bfe9f6057d09753fc906333d021e64e19a419dc8a40c91823a425b2f982' - '2ef3cb6f2c35a30c95228b40bd49632c295b5c4f6431afbdf7e42e5ff835ff66' - '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, CA, California'* ]]; 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 Inc.' ]]; then - error 'Unable to resolve IPv4 address to ASN.' - return 1 - fi - - if [[ $(geoiplookup6 -f GeoIPASNumv6.dat 2001:4860:4860::8888) != *'AS15169 Google Inc.' ]]; 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 295570, geoip-database/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2017-05-10 21:23:36 UTC (rev 295571) @@ -0,0 +1,97 @@ +# $Id$ +# Maintainer: Evangelos Foutras <evange...@foutrelis.com> + +pkgname=('geoip-database' 'geoip-database-extra') +pkgver=20170502 +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=('b66004683e4f3bb0c7dd9f8e928ea840372374d9e69bbf5b4671eecf24985311' + 'fe2cea97c527aa18c9cdc8c7fa0eb47fe487d845733be5b5d74503b977410844' + '189f4c073dee129bec45c519b03f941dd4a4176590383b7c65ced082bede895b' + '3f923bbc1a8cbe001b5dbe35d62a49ae6aa2543ad413fb56f9c2136204f7541b' + '02ac8ee60da518d2bbccca178623b2cb8f34ff9489ffa559f21a22d9340df6c9' + 'a9d8651a3176dc986c73fd93d6b617b8413ae84322e658c00c47265d87f8b0e6' + '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, CA, California'* ]]; 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 Inc.' ]]; then + error 'Unable to resolve IPv4 address to ASN.' + return 1 + fi + + if [[ $(geoiplookup6 -f GeoIPASNumv6.dat 2001:4860:4860::8888) != *'AS15169 Google Inc.' ]]; 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 2017-05-10 21:23:28 UTC (rev 295570) +++ check-last-modified.sh 2017-05-10 21:23:36 UTC (rev 295571) @@ -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 ^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 295570, geoip-database/trunk/check-last-modified.sh) =================================================================== --- check-last-modified.sh (rev 0) +++ check-last-modified.sh 2017-05-10 21:23:36 UTC (rev 295571) @@ -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 ^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