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

Evangelos Foutras foutrelis at gemini.archlinux.org
Wed Aug 24 02:49:35 UTC 2022


    Date: Wednesday, August 24, 2022 @ 02:49:35
  Author: foutrelis
Revision: 454467

archrelease: copy trunk to extra-any

Added:
  geoip-database/repos/extra-any/PKGBUILD
    (from rev 454466, geoip-database/trunk/PKGBUILD)
  geoip-database/repos/extra-any/update.sh
    (from rev 454466, 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-08-24 02:49:30 UTC (rev 454466)
+++ PKGBUILD	2022-08-24 02:49:35 UTC (rev 454467)
@@ -1,82 +0,0 @@
-# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
-
-pkgname=('geoip-database' 'geoip-database-extra')
-pkgver=20220802
-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=('1a8acae78a84f9bb61d4ddefc4524cc9730f5c6b408b84adb7eebde9016d462c'
-            'f6279b663ad48d4ef5a8c0069c07e80f9f08c1f56394488730237c71f16a6cca'
-            'ea50dea5b418c4373aec7e6e797f75a25067b586876a86de905dc81f92185927'
-            'abec2de28e81d6771946995e622ddb5cc7d805b9bc50a11b7a9e9ac36d8c56ee'
-            'a092179c2d4b4834eb00ccd3d719da79be002fa16157f2d8f3435da6a8176164'
-            '679e97d437698eaa317e9dc9c47430e02aec1867a9132958505af309dadc84d8')
-
-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 454466, geoip-database/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2022-08-24 02:49:35 UTC (rev 454467)
@@ -0,0 +1,82 @@
+# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
+
+pkgname=('geoip-database' 'geoip-database-extra')
+pkgver=20220823
+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=('1ebd739106f0a62a55101537d3012ef547fe84ce89d9490bef8592bfe293199a'
+            'a863a20927c4a8f8da134359674d5ab4747494b2e800eb11c919bb8fe8b9042f'
+            '047b2afe1e846e248d1e6c759e250f4038bb8d49c1b35656b5b0c19563e84bc5'
+            '7a54fc61f7fd660811a6d0e7bfb7eae579dc408b0c26dd80823672fee7cb918b'
+            'b065cfe1f4f8556daf6661055304853c56392a692456af4d96a780a7b45ee501'
+            'f2e079f73de8c7211ccc9d275c8f6aef2315605e837f5154f225b420a0826f16')
+
+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-08-24 02:49:30 UTC (rev 454466)
+++ update.sh	2022-08-24 02:49:35 UTC (rev 454467)
@@ -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 454466, geoip-database/trunk/update.sh)
===================================================================
--- update.sh	                        (rev 0)
+++ update.sh	2022-08-24 02:49:35 UTC (rev 454467)
@@ -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