[arch-commits] Commit in geoip-database/repos/extra-any (4 files)
Evangelos Foutras
foutrelis at archlinux.org
Mon Nov 16 23:34:30 UTC 2020
Date: Monday, November 16, 2020 @ 23:34:30
Author: foutrelis
Revision: 401296
archrelease: copy trunk to extra-any
Added:
geoip-database/repos/extra-any/PKGBUILD
(from rev 401295, geoip-database/trunk/PKGBUILD)
geoip-database/repos/extra-any/update.sh
(from rev 401295, 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-11-16 23:34:24 UTC (rev 401295)
+++ PKGBUILD 2020-11-16 23:34:30 UTC (rev 401296)
@@ -1,82 +0,0 @@
-# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
-
-pkgname=('geoip-database' 'geoip-database-extra')
-pkgver=20200929
-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=('129019d68c6a35ccd903986b5195c8e1c4411482f99c0e406ab886f9aa634dc2'
- 'bafe84f8ffd3033faae641033fe9309367d32296868c7dd3c69bf4bc95151186'
- '9cc213a9db836db9dd507abad7117fc447dccbd22e78fcf170bc9a88d7690a4e'
- '8c6a23ae28e819dafe05abd5cd544c61dc2bd5e9245db6981ee079d488ac3d02'
- '54c8e3dc1a122de2e4da5fe85674deaa3abdcf3593df751934b859f6b6391913'
- '7839848424cdd7d78a9fe9b9d5094120d1ced88070527725d717d0ef192ca11d')
-
-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 401295, geoip-database/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-11-16 23:34:30 UTC (rev 401296)
@@ -0,0 +1,82 @@
+# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
+
+pkgname=('geoip-database' 'geoip-database-extra')
+pkgver=20201110
+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=('a3226135d175c410c5647fef100c706bd57619eefbcbed676767cae07a044e45'
+ '50b0697bd0657f8f9cfb5f377430ea4fc2e9216df98c1c45f97beb98a8cc667d'
+ '17c18d4f31c15f1c9a423afe0186a9a20b94efa4cd4e620856a15e7a0b3bb882'
+ '7126a38de87a9f324a3cd711cc33d29fb2326c171245e5ae6cf5cf7a48350b48'
+ '6211f4a4d93cabf16a554b2569b37998d85bd74ad595cc80d88a4ceb3531c4d9'
+ '24f5c6dd0aa29e86d68ffee03a9516f4a049705e36060b5e34855020027de21d')
+
+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:
Deleted: update.sh
===================================================================
--- update.sh 2020-11-16 23:34:24 UTC (rev 401295)
+++ update.sh 2020-11-16 23:34:30 UTC (rev 401296)
@@ -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 401295, geoip-database/trunk/update.sh)
===================================================================
--- update.sh (rev 0)
+++ update.sh 2020-11-16 23:34:30 UTC (rev 401296)
@@ -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
More information about the arch-commits
mailing list