[arch-commits] Commit in geoip-database/repos/extra-any (4 files)
Evangelos Foutras
foutrelis at gemini.archlinux.org
Wed Oct 27 07:33:15 UTC 2021
Date: Wednesday, October 27, 2021 @ 07:33:15
Author: foutrelis
Revision: 426716
archrelease: copy trunk to extra-any
Added:
geoip-database/repos/extra-any/PKGBUILD
(from rev 426715, geoip-database/trunk/PKGBUILD)
geoip-database/repos/extra-any/update.sh
(from rev 426715, 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 2021-10-27 07:33:10 UTC (rev 426715)
+++ PKGBUILD 2021-10-27 07:33:15 UTC (rev 426716)
@@ -1,82 +0,0 @@
-# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
-
-pkgname=('geoip-database' 'geoip-database-extra')
-pkgver=20210921
-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=('f587958909623b91f72ddb3bd8e5dcdd6fe2108f42dabfce432d6cba7afa7896'
- '87ead4d05bce319fbb0bf6f19edf760f6365229c8d88786a6db08797764d2edd'
- '49bd55c144021167380595938580e099420de0e6977418be7ca15428ba4f48bd'
- 'db2633aecb520414efe8bf198eb6602f2975743491a7a843da8d3926b9d085b7'
- 'dff82f95ab96a618aee4e0966ca0bf41412e082e0ec1bae18f13398474833584'
- 'fd39605dd14751a3dc42a32f5f620364353b14c85d04885dfa1a9d68d9827bae')
-
-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 426715, geoip-database/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-10-27 07:33:15 UTC (rev 426716)
@@ -0,0 +1,82 @@
+# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
+
+pkgname=('geoip-database' 'geoip-database-extra')
+pkgver=20211026
+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=('8b561328de2080ea28716a74ec32217a5d60616202fb21654de1a780f404c4d7'
+ 'b50eb2e3472427206af845ab795d0f4478341c9289ba3912a4a5e0f5d8d8e168'
+ '161c240a50226dc94c9a4b7e159b90dab09da2fb4da8a3d2f3214dcd07bdada9'
+ '9834491a590bd504817ea2defc6525f476f3ed79f311a928f319943dfefb8714'
+ '3c14d19d7fa877af57976d7211cb52f07a71acf256c8bb4381884431dfed2d3e'
+ 'c9fe342b112bf0507e63a6227faa889545f8ee8fd032e3ee1aea6117a3de55c5')
+
+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 2021-10-27 07:33:10 UTC (rev 426715)
+++ update.sh 2021-10-27 07:33:15 UTC (rev 426716)
@@ -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 426715, geoip-database/trunk/update.sh)
===================================================================
--- update.sh (rev 0)
+++ update.sh 2021-10-27 07:33:15 UTC (rev 426716)
@@ -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