Date: Sunday, July 26, 2020 @ 16:14:30 Author: foutrelis Revision: 392556
archrelease: copy trunk to extra-any Added: geoip-database/repos/extra-any/PKGBUILD (from rev 392555, geoip-database/trunk/PKGBUILD) geoip-database/repos/extra-any/update.sh (from rev 392555, geoip-database/trunk/update.sh) Deleted: geoip-database/repos/extra-any/PKGBUILD geoip-database/repos/extra-any/update.sh -----------+ PKGBUILD | 164 ++++++++++++++++++++++++++++++------------------------------ update.sh | 54 +++++++++---------- 2 files changed, 109 insertions(+), 109 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2020-07-26 16:14:26 UTC (rev 392555) +++ PKGBUILD 2020-07-26 16:14:30 UTC (rev 392556) @@ -1,82 +0,0 @@ -# Maintainer: Evangelos Foutras <evange...@foutrelis.com> - -pkgname=('geoip-database' 'geoip-database-extra') -pkgver=20200609 -pkgrel=1 -arch=('any') -url="https://mailfud.org/geoip-legacy/" -license=('CCPL:by-sa') -makedepends=('util-linux') -checkdepends=('geoip') -_source_base=https://sources.archlinux.org/other/packages/$pkgname/$pkgver -source=(GeoIP-$pkgver.dat.gz::$_source_base/GeoIP.dat.gz - GeoIPv6-$pkgver.dat.gz::$_source_base/GeoIPv6.dat.gz - GeoIPCity-$pkgver.dat.gz::$_source_base/GeoIPCity.dat.gz - GeoIPCityv6-$pkgver.dat.gz::$_source_base/GeoIPCityv6.dat.gz - GeoIPASNum-$pkgver.dat.gz::$_source_base/GeoIPASNum.dat.gz - GeoIPASNumv6-$pkgver.dat.gz::$_source_base/GeoIPASNumv6.dat.gz) -sha256sums=('6dc009a7baf02cd29a1de87e8ea37fc982645fa84ab728924f96158ef40d3284' - '3f3fdf1298968c78e7d31e3203c41ecceaf4b28b50760956c0ccb832ab131623' - '8c50098ec25b7e8b4183952581e757d9ab9b9b2958c7df41ac9a9bdb773d9a2e' - '2beffaf55957dd2561079fb572632c0ee655d5ca159cce8289b056710a6d4ba7' - '4f1b13a3b2ed7f9ca8c3f4fbf7f3e50129835f7024a436ae2967805bddb6b6b4' - '44b0db53d46604a8dd706fe635bd49f352c34fadf0515ef69b731b99c64f4ec6') - -prepare() { - cd "$srcdir" - rename -v -- "-$pkgver" '' *.dat -} - -check() { - cd "$srcdir" - - if [[ $(geoiplookup -f GeoIP.dat 8.8.8.8) != *'US, United States' ]]; then - echo >&2 'Unable to resolve IPv4 address to country.' - return 1 - fi - - if [[ $(geoiplookup6 -f GeoIPv6.dat 2001:4860:4860::8888) != *'US, United States' ]]; then - echo >&2 'Unable to resolve IPv6 address to country.' - return 1 - fi - - if [[ $(geoiplookup -f GeoIPCity.dat 8.8.8.8) != *'US, 00, N/A, N/A'* ]]; then - echo >&2 'Unable to resolve IPv4 address to city.' - return 1 - fi - - if [[ $(geoiplookup6 -f GeoIPCityv6.dat 2001:4860:4860::8888) != *'US, 00, N/A, N/A'* ]]; then - echo >&2 'Unable to resolve IPv6 address to city.' - return 1 - fi - - if [[ $(geoiplookup -f GeoIPASNum.dat 8.8.8.8) != *'AS15169 GOOGLE' ]]; then - echo >&2 'Unable to resolve IPv4 address to ASN.' - return 1 - fi - - if [[ $(geoiplookup6 -f GeoIPASNumv6.dat 2001:4860:4860::8888) != *'AS15169 GOOGLE' ]]; then - echo >&2 'Unable to resolve IPv6 address to ASN.' - return 1 - fi -} - -package_geoip-database() { - pkgdesc="GeoIP legacy country database (based on GeoLite2 data created by MaxMind)" - - cd "$srcdir" - - install -d "$pkgdir/usr/share/GeoIP" - install -m644 -t "$pkgdir/usr/share/GeoIP" GeoIP{,v6}.dat -} - -package_geoip-database-extra() { - pkgdesc="GeoIP legacy city/ASN databases (based on GeoLite2 data created by MaxMind)" - - cd "$srcdir" - - install -d "$pkgdir/usr/share/GeoIP" - install -m644 -t "$pkgdir/usr/share/GeoIP" GeoIPCity{,v6}.dat GeoIPASNum{,v6}.dat -} - -# vim:set ts=2 sw=2 et: Copied: geoip-database/repos/extra-any/PKGBUILD (from rev 392555, geoip-database/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2020-07-26 16:14:30 UTC (rev 392556) @@ -0,0 +1,82 @@ +# Maintainer: Evangelos Foutras <evange...@foutrelis.com> + +pkgname=('geoip-database' 'geoip-database-extra') +pkgver=20200721 +pkgrel=1 +arch=('any') +url="https://mailfud.org/geoip-legacy/" +license=('CCPL:by-sa') +makedepends=('util-linux') +checkdepends=('geoip') +_source_base=https://sources.archlinux.org/other/packages/$pkgname/$pkgver +source=(GeoIP-$pkgver.dat.gz::$_source_base/GeoIP.dat.gz + GeoIPv6-$pkgver.dat.gz::$_source_base/GeoIPv6.dat.gz + GeoIPCity-$pkgver.dat.gz::$_source_base/GeoIPCity.dat.gz + GeoIPCityv6-$pkgver.dat.gz::$_source_base/GeoIPCityv6.dat.gz + GeoIPASNum-$pkgver.dat.gz::$_source_base/GeoIPASNum.dat.gz + GeoIPASNumv6-$pkgver.dat.gz::$_source_base/GeoIPASNumv6.dat.gz) +sha256sums=('617700bff76aa3c50978174a482cd355b0f3b2c3c70b4bd40458c10c326840c0' + '657df26d535b298cced122916636cc7a7a9d1b2e3de646e53ac3e0a41dc1a618' + '06a905d39bb9d1acd9b772aef4823a2c27bfea3dfc0bf98cc5ff73da878d3eb6' + 'b171f9b33d0ce92af3b51eda41e951f4a5b14903beebfd0b9abea730773f4087' + '6891239fd9826e24f1b50db9d3a665bb958bcb42fdf3249579faceaf8ff0f6c9' + 'cb12e6c96d8b5e263b0f43f68f5415a2cd005940c6cc7b6f52945269475d9628') + +prepare() { + cd "$srcdir" + rename -v -- "-$pkgver" '' *.dat +} + +check() { + cd "$srcdir" + + if [[ $(geoiplookup -f GeoIP.dat 8.8.8.8) != *'US, United States' ]]; then + echo >&2 'Unable to resolve IPv4 address to country.' + return 1 + fi + + if [[ $(geoiplookup6 -f GeoIPv6.dat 2001:4860:4860::8888) != *'US, United States' ]]; then + echo >&2 'Unable to resolve IPv6 address to country.' + return 1 + fi + + if [[ $(geoiplookup -f GeoIPCity.dat 8.8.8.8) != *'US, MO, Missouri'* ]]; then + echo >&2 'Unable to resolve IPv4 address to city.' + return 1 + fi + + if [[ $(geoiplookup6 -f GeoIPCityv6.dat 2001:4860:4860::8888) != *'US, 00, N/A, N/A'* ]]; then + echo >&2 'Unable to resolve IPv6 address to city.' + return 1 + fi + + if [[ $(geoiplookup -f GeoIPASNum.dat 8.8.8.8) != *'AS15169 GOOGLE' ]]; then + echo >&2 'Unable to resolve IPv4 address to ASN.' + return 1 + fi + + if [[ $(geoiplookup6 -f GeoIPASNumv6.dat 2001:4860:4860::8888) != *'AS15169 GOOGLE' ]]; then + echo >&2 'Unable to resolve IPv6 address to ASN.' + return 1 + fi +} + +package_geoip-database() { + pkgdesc="GeoIP legacy country database (based on GeoLite2 data created by MaxMind)" + + cd "$srcdir" + + install -d "$pkgdir/usr/share/GeoIP" + install -m644 -t "$pkgdir/usr/share/GeoIP" GeoIP{,v6}.dat +} + +package_geoip-database-extra() { + pkgdesc="GeoIP legacy city/ASN databases (based on GeoLite2 data created by MaxMind)" + + cd "$srcdir" + + install -d "$pkgdir/usr/share/GeoIP" + install -m644 -t "$pkgdir/usr/share/GeoIP" GeoIPCity{,v6}.dat GeoIPASNum{,v6}.dat +} + +# vim:set ts=2 sw=2 et: Deleted: update.sh =================================================================== --- update.sh 2020-07-26 16:14:26 UTC (rev 392555) +++ update.sh 2020-07-26 16:14:30 UTC (rev 392556) @@ -1,27 +0,0 @@ -#!/bin/bash - -set -eo pipefail - -readonly upstream=https://mailfud.org/geoip-legacy/ - -version=$(curl -s "$upstream" | grep -Po 'CSV_\K[0-9]{8}' | sort -u) - -if [[ ${#version} != 8 ]]; then - echo >&2 'Unable to determine upstream database version' - exit 1 -fi - -pkgver=$(. PKGBUILD; echo $pkgver) - -if ((pkgver >= version)); then - echo >&2 "Already at version $pkgver (>= $version upstream)" - exit 1 -fi - -ssh -T sources.archlinux.org <<-EOF - mkdir -p /srv/sources/other/packages/geoip-database/$version && - cd /srv/sources/other/packages/geoip-database/$version && - wget -nc $upstream/GeoIP{,City,ASNum}{,v6}.dat.gz -EOF - -sed -i -e "/^pkgver=/c pkgver=$version" -e "/^pkgrel=/c pkgrel=1" PKGBUILD Copied: geoip-database/repos/extra-any/update.sh (from rev 392555, geoip-database/trunk/update.sh) =================================================================== --- update.sh (rev 0) +++ update.sh 2020-07-26 16:14:30 UTC (rev 392556) @@ -0,0 +1,27 @@ +#!/bin/bash + +set -eo pipefail + +readonly upstream=https://mailfud.org/geoip-legacy/ + +version=$(curl -s "$upstream" | grep -Po 'CSV_\K[0-9]{8}' | sort -u) + +if [[ ${#version} != 8 ]]; then + echo >&2 'Unable to determine upstream database version' + exit 1 +fi + +pkgver=$(. PKGBUILD; echo $pkgver) + +if ((pkgver >= version)); then + echo >&2 "Already at version $pkgver (>= $version upstream)" + exit 1 +fi + +ssh -T sources.archlinux.org <<-EOF + mkdir -p /srv/sources/other/packages/geoip-database/$version && + cd /srv/sources/other/packages/geoip-database/$version && + wget -nc $upstream/GeoIP{,City,ASNum}{,v6}.dat.gz +EOF + +sed -i -e "/^pkgver=/c pkgver=$version" -e "/^pkgrel=/c pkgrel=1" PKGBUILD