From 33cadd269f4748f0c1f8c7f977c8fae3124f3494 Mon Sep 17 00:00:00 2001
From: sarthurdev <965089+sarthurdev@users.noreply.github.com>
Date: Fri, 28 Nov 2025 15:27:49 +0100
Subject: geoip: T5746: Download ASN database

---
 .../hooks/live/40-init-geoip-database.chroot                | 13 ++++++++++++-
 data/live-build-config/rootfs/excludes                      |  1 +
 2 files changed, 13 insertions(+), 1 deletion(-)

(limited to 'data')

diff --git a/data/live-build-config/hooks/live/40-init-geoip-database.chroot b/data/live-build-config/hooks/live/40-init-geoip-database.chroot
index 9f939f0a..b20a80cb 100755
--- a/data/live-build-config/hooks/live/40-init-geoip-database.chroot
+++ b/data/live-build-config/hooks/live/40-init-geoip-database.chroot
@@ -7,13 +7,24 @@ DATE_SUFFIX=$(date +%Y-%m)
 URL="https://download.db-ip.com/free/dbip-country-lite-${DATE_SUFFIX}.csv.gz"
 OUT_PATH="/usr/share/vyos-geoip/dbip-country-lite.csv.gz"
 
+ASN_URL="https://download.db-ip.com/free/dbip-asn-lite-${DATE_SUFFIX}.csv.gz"
+ASN_OUT_PATH="/usr/share/vyos-geoip/dbip-asn-lite.csv.gz"
+
 mkdir -p $(dirname $OUT_PATH)
 wget -O - $URL > $OUT_PATH
 
 if [ $? -ne 0 ]; then
-    echo "Failed to download GeoIP database"
+    echo "Failed to download GeoIP country-code database"
     rm $OUT_PATH
 fi
 
+mkdir -p $(dirname $ASN_OUT_PATH)
+wget -O - $ASN_URL > $ASN_OUT_PATH
+
+if [ $? -ne 0 ]; then
+    echo "Failed to download GeoIP ASN database"
+    rm $ASN_OUT_PATH
+fi
+
 # Generate sqlite database
 python3 /usr/libexec/vyos/geoip-update.py --init
diff --git a/data/live-build-config/rootfs/excludes b/data/live-build-config/rootfs/excludes
index b824c57c..ac646388 100644
--- a/data/live-build-config/rootfs/excludes
+++ b/data/live-build-config/rootfs/excludes
@@ -45,6 +45,7 @@ usr/local/games/*
 
 # T5511: We do not need any caches on the system (will be recreated when needed).
 # T7278: We need directory created by python3-cracklib for password checks
+# T7926: VyOS GeoIP database location
 var/cache/!(cracklib|vyos)
 
 # T5511: We do not need any log-files on the system (will be recreated when needed).
-- 
cgit v1.2.3


From ea19696ae03d3aaeb145c0ac3fcfa6d4fafe2df2 Mon Sep 17 00:00:00 2001
From: sarthurdev <965089+sarthurdev@users.noreply.github.com>
Date: Wed, 17 Jun 2026 10:48:57 +0200
Subject: geoip: T5746: Use curl to download databases

---
 data/live-build-config/hooks/live/40-init-geoip-database.chroot | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'data')

diff --git a/data/live-build-config/hooks/live/40-init-geoip-database.chroot b/data/live-build-config/hooks/live/40-init-geoip-database.chroot
index b20a80cb..da6d8261 100755
--- a/data/live-build-config/hooks/live/40-init-geoip-database.chroot
+++ b/data/live-build-config/hooks/live/40-init-geoip-database.chroot
@@ -11,7 +11,7 @@ ASN_URL="https://download.db-ip.com/free/dbip-asn-lite-${DATE_SUFFIX}.csv.gz"
 ASN_OUT_PATH="/usr/share/vyos-geoip/dbip-asn-lite.csv.gz"
 
 mkdir -p $(dirname $OUT_PATH)
-wget -O - $URL > $OUT_PATH
+curl -sSfL -o $OUT_PATH $URL
 
 if [ $? -ne 0 ]; then
     echo "Failed to download GeoIP country-code database"
@@ -19,7 +19,7 @@ if [ $? -ne 0 ]; then
 fi
 
 mkdir -p $(dirname $ASN_OUT_PATH)
-wget -O - $ASN_URL > $ASN_OUT_PATH
+curl -sSfL -o $ASN_OUT_PATH $ASN_URL
 
 if [ $? -ne 0 ]; then
     echo "Failed to download GeoIP ASN database"
-- 
cgit v1.2.3