[arch-commits] Commit in geoip-database/repos/extra-any (4 files)

Evangelos Foutras foutrelis at archlinux.org
Thu Dec 24 17:54:07 UTC 2020


    Date: Thursday, December 24, 2020 @ 17:54:07
  Author: foutrelis
Revision: 405002

archrelease: copy trunk to extra-any

Added:
  geoip-database/repos/extra-any/PKGBUILD
    (from rev 405001, geoip-database/trunk/PKGBUILD)
  geoip-database/repos/extra-any/update.sh
    (from rev 405001, 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-12-24 17:53:59 UTC (rev 405001)
+++ PKGBUILD	2020-12-24 17:54:07 UTC (rev 405002)
@@ -1,82 +0,0 @@
-# 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:

Copied: geoip-database/repos/extra-any/PKGBUILD (from rev 405001, geoip-database/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-12-24 17:54:07 UTC (rev 405002)
@@ -0,0 +1,82 @@
+# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
+
+pkgname=('geoip-database' 'geoip-database-extra')
+pkgver=20201222
+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=('403ec2f2b252c8a8ff01f330d03fe729ef4bd3d63e36e26c2e0f114b8db1b97b'
+            'a4b2d78b26ef091189f2da53dfdd5cf4bb157184bc732621f8e7b482cdb7aa82'
+            '760844e694bd5b65670f548a737e6485ef2ce13ce9dc3fdbb746a913074e098b'
+            '19938ca7154904531530ea28b02c9a28b95696ef5b8fb8c944f5ec2b421b6049'
+            '85dd2ba5246a2964ef7a7b165ae81af3fdea218a307f2ed8514d481f19798b1c'
+            'de644cd158a686c8a89ea00fb2f494b22f515fe698b06ec46a52effbaadcaf38')
+
+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-12-24 17:53:59 UTC (rev 405001)
+++ update.sh	2020-12-24 17:54:07 UTC (rev 405002)
@@ -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 405001, geoip-database/trunk/update.sh)
===================================================================
--- update.sh	                        (rev 0)
+++ update.sh	2020-12-24 17:54:07 UTC (rev 405002)
@@ -0,0 +1,27 @@
+#!/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 -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