[arch-commits] Commit in geoip-database/repos/extra-any (4 files)
Evangelos Foutras
foutrelis at gemini.archlinux.org
Fri Mar 18 15:55:46 UTC 2022
Date: Friday, March 18, 2022 @ 15:55:46
Author: foutrelis
Revision: 439941
archrelease: copy trunk to extra-any
Added:
geoip-database/repos/extra-any/PKGBUILD
(from rev 439940, geoip-database/trunk/PKGBUILD)
geoip-database/repos/extra-any/update.sh
(from rev 439940, geoip-database/trunk/update.sh)
Deleted:
geoip-database/repos/extra-any/PKGBUILD
geoip-database/repos/extra-any/update.sh
-----------+
PKGBUILD | 164 ++++++++++++++++++++++++++++++------------------------------
update.sh | 56 ++++++++++----------
2 files changed, 110 insertions(+), 110 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-03-18 15:55:41 UTC (rev 439940)
+++ PKGBUILD 2022-03-18 15:55:46 UTC (rev 439941)
@@ -1,82 +0,0 @@
-# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
-
-pkgname=('geoip-database' 'geoip-database-extra')
-pkgver=20220222
-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=('e0133aafa62accfe57dea6d454c02f22a65aaba7775cbb4539f2a271da097db5'
- 'e5745bdf59be2c2be5bc4f1d97306158b0e74db971540319dcfd40c59ab71739'
- 'd4ac6997a838a51e83ebae824558fa768a07986afb5793afa8dc146dd5f8ad88'
- 'faf1d4f2bfaddcacfb195ecb10dce4b02d1c7cf6e23d1dd849a4a8baa8e4299b'
- '3c2262cc641d1f9eae272973c211e89b3771feb5123747ab1f38d2a0518acb9a'
- 'ad98a4e2ab55c7d93df4188b8b55c8aa9587415a2e5b7f713f067b46aab26f89')
-
-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 439940, geoip-database/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-03-18 15:55:46 UTC (rev 439941)
@@ -0,0 +1,82 @@
+# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
+
+pkgname=('geoip-database' 'geoip-database-extra')
+pkgver=20220315
+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=('d78c267f2439838ff8a8ece9452602f80704e8210ca86cad6dca7eac97f08f6d'
+ '931b5746c894885ec463d0bdb23063d88a83a471c49132336fb8a073ace4e331'
+ '68c0272d5f8ea957730679f81aa545e2ed035ad9cb53862b8287da36447f198d'
+ '94e4d8ad82ed19ef994aff5dee72224a8cbb6b99ba357e7cc19679b0ef6db057'
+ '7561d1d74a2d79445f5bf640ae1dcf030d428b0b805c0be171958f85db8277d9'
+ '8fe59696a63061147bc36903e6a7c106659fba88b4d7611c86ab50217ed2faa2')
+
+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 2022-03-18 15:55:41 UTC (rev 439940)
+++ update.sh 2022-03-18 15:55:46 UTC (rev 439941)
@@ -1,28 +0,0 @@
-#!/bin/bash
-
-set -eo pipefail
-
-readonly upstream=https://mailfud.org/geoip-legacy/
-
-version=$(curl -s "$upstream/build.log" | grep -Po 'CSV_\K[0-9]{8}' |
- sort -n | tail -1)
-
-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 &&
- curl --remote-name-all $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 439940, geoip-database/trunk/update.sh)
===================================================================
--- update.sh (rev 0)
+++ update.sh 2022-03-18 15:55:46 UTC (rev 439941)
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+set -eo pipefail
+
+readonly upstream=https://mailfud.org/geoip-legacy/
+
+version=$(curl -s "$upstream/build.log" | grep -Po 'CSV_\K[0-9]{8}' |
+ sort -n | tail -1)
+
+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 &&
+ curl --remote-name-all $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