[arch-commits] Commit in geoip-database/repos/extra-any (4 files)
Evangelos Foutras
foutrelis at gemini.archlinux.org
Wed May 25 19:49:54 UTC 2022
Date: Wednesday, May 25, 2022 @ 19:49:54
Author: foutrelis
Revision: 446530
archrelease: copy trunk to extra-any
Added:
geoip-database/repos/extra-any/PKGBUILD
(from rev 446529, geoip-database/trunk/PKGBUILD)
geoip-database/repos/extra-any/update.sh
(from rev 446529, 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-05-25 19:49:49 UTC (rev 446529)
+++ PKGBUILD 2022-05-25 19:49:54 UTC (rev 446530)
@@ -1,82 +0,0 @@
-# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
-
-pkgname=('geoip-database' 'geoip-database-extra')
-pkgver=20220419
-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=('6f139d41a7b3f1ca0f8cb6aa5f0a907c4d7948ab1f95ddaa9ebf61b45dc20ddd'
- '9448afe7e22908c0a10fd82a0e4c0a77812e7750c38caa673563c608775f6b0f'
- '83aa8c2113a2b47bfb8518d7b5b00f2b3bc46e48ef6d556994d61e2d11d438cf'
- '89baba3efde448eb8c594fc23e39fa1625823cfad00192a15df4366268c4ac6f'
- '5ce8216a4a525e8037375412d5efa9aeb9eea332f23698b4ab57818a467f1f43'
- '5e8cb68d5886579feb7d63c6f7df3b6e02d062c5aff7a9697b6f92f223418340')
-
-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 446529, geoip-database/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-05-25 19:49:54 UTC (rev 446530)
@@ -0,0 +1,82 @@
+# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
+
+pkgname=('geoip-database' 'geoip-database-extra')
+pkgver=20220524
+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=('cfb1caaefa31c63f4fd14cc558719a79e3a9c1f249eb904fbbc8e5bd5e7d531c'
+ '20b9e2f237fcc0886bf28d3be64fd6bd817aa297a2771adc5abbb1e65573d6e4'
+ '57e5dde72409be7e072f30a0541a033d7c6e0ff1b2f02e2e25cc5a55ace3b639'
+ 'd47440da29f232e6660272cba83cac148162098b22ea6c387da90e529e95c016'
+ '61b07be55a3e391921172b0303916b2dab641f94ed09bb98fe91cd050174044b'
+ 'a65a3e4390ceb0743a7aae4280854efbf81aa1eb2b62f0e8a127c302a7655f47')
+
+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-05-25 19:49:49 UTC (rev 446529)
+++ update.sh 2022-05-25 19:49:54 UTC (rev 446530)
@@ -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 446529, geoip-database/trunk/update.sh)
===================================================================
--- update.sh (rev 0)
+++ update.sh 2022-05-25 19:49:54 UTC (rev 446530)
@@ -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