From 9543a56982cd6da2ca307c9517c2a939bde0f1da Mon Sep 17 00:00:00 2001
From: nocci <dev@sky-net.it>
Date: Fri, 12 Dec 2025 12:29:01 +0000
Subject: [PATCH] Point fetch script to taler-* tarball names and current
 releases

---
 README-DE.md              |  2 +-
 README.md                 |  2 +-
 scripts/fetch-tarballs.sh | 11 ++++++-----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/README-DE.md b/README-DE.md
index 09934f3..521b2e8 100644
--- a/README-DE.md
+++ b/README-DE.md
@@ -48,7 +48,7 @@ Container-Stack für GNU Taler (Exchange, Merchant, LibEuFin Bank) mit optionale
 - Nach Passwortänderungen in `.env` ist kein manuelles SQL-Rendering nötig; das Init-Skript liest sie beim Start.
 - Release-Refs/Tarballs: Tags/Commits unter `https://git.taler.net/{gnunet,exchange,merchant,libeufin}.git/` ansehen (Tarballs via `.../snapshot/<tag>.tar.gz`) und `*_REF`/`GNUNET_TARBALL_URL` entsprechend setzen.
 - Offline-Tarballs: Lege Tarballs unter `vendor/` ab (`gnunet-*.tar.gz`, `exchange-*.tar.gz`, `merchant-*.tar.gz`, `libeufin-*.tar.gz`); bei unvollständigem Tarball fällt der Build auf Git zurück.
-- Release-Tarballs laden: `./scripts/fetch-tarballs.sh` (GNUnet von `https://ftp.gnu.org/gnu/gnunet/gnunet-<version>.tar.gz`, Taler-Komponenten von `https://ftp.fau.de/gnu/taler/`; liest `.env`, deshalb greifen `*_VERSION` oder `*_TARBALL_URL`).
+- Release-Tarballs laden: `./scripts/fetch-tarballs.sh` (GNUnet von `https://ftp.gnu.org/gnu/gnunet/gnunet-<version>.tar.gz`, Taler-Komponenten mit Präfix `taler-` von `https://ftp.fau.de/gnu/taler/`; liest `.env`, deshalb greifen `*_VERSION` oder `*_TARBALL_URL`).
 
 ## Nützliche Kommandos
 - Logs: `docker compose logs -f exchange` (oder bank/merchant/caddy/wordpress).
diff --git a/README.md b/README.md
index 5fd9a70..2cdc2e5 100644
--- a/README.md
+++ b/README.md
@@ -48,7 +48,7 @@ Container stack for GNU Taler (Exchange, Merchant, LibEuFin Bank) with optional
 - After changing DB passwords in `.env`, no manual SQL rendering is needed—the init script reads them at container start.
 - Release refs/tarballs: Browse tags/commits at `https://git.taler.net/{gnunet,exchange,merchant,libeufin}.git/` (Tarballs via `.../snapshot/<tag>.tar.gz`) and set `*_REF`/`GNUNET_TARBALL_URL` accordingly.
 - Offline tarball drop-in: place tarballs under `vendor/` (`gnunet-*.tar.gz`, `exchange-*.tar.gz`, `merchant-*.tar.gz`, `libeufin-*.tar.gz`); the build picks the first match and falls back to git if incomplete.
-- Fetch release tarballs: `./scripts/fetch-tarballs.sh` (GNUnet from `https://ftp.gnu.org/gnu/gnunet/gnunet-<version>.tar.gz`, Taler components from `https://ftp.fau.de/gnu/taler/`; reads `.env` so `*_VERSION`/`*_TARBALL_URL` overrides work).
+- Fetch release tarballs: `./scripts/fetch-tarballs.sh` (GNUnet from `https://ftp.gnu.org/gnu/gnunet/gnunet-<version>.tar.gz`, Taler components with `taler-` prefix from `https://ftp.fau.de/gnu/taler/`; reads `.env` so `*_VERSION`/`*_TARBALL_URL` overrides work).
 
 ## Useful commands
 - Logs: `docker compose logs -f exchange` (or bank/merchant/caddy/wordpress).
diff --git a/scripts/fetch-tarballs.sh b/scripts/fetch-tarballs.sh
index 80939a8..527aeec 100755
--- a/scripts/fetch-tarballs.sh
+++ b/scripts/fetch-tarballs.sh
@@ -19,14 +19,15 @@ if [[ -f "${ROOT_DIR}/.env" ]]; then
 fi
 
 GNUNET_VERSION="${GNUNET_VERSION:-0.21.2}"
-EXCHANGE_VERSION="${EXCHANGE_VERSION:-1.2.2}"
-MERCHANT_VERSION="${MERCHANT_VERSION:-1.1.6}"
-LIBEUFIN_VERSION="${LIBEUFIN_VERSION:-1.2.3}"
+# Use the Taler release tarball naming (taler-<component>-<version>.tar.gz)
+EXCHANGE_VERSION="${EXCHANGE_VERSION:-1.0.0}"
+MERCHANT_VERSION="${MERCHANT_VERSION:-1.1.3}"
+LIBEUFIN_VERSION="${LIBEUFIN_VERSION:-1.2.0}"
 
 # GNUnet tarball is hosted under the GNUnet mirror, Taler components under the Taler mirror.
 GNUNET_URL="${GNUNET_TARBALL_URL:-https://ftp.gnu.org/gnu/gnunet/gnunet-${GNUNET_VERSION}.tar.gz}"
-EXCHANGE_URL="${EXCHANGE_TARBALL_URL:-https://ftp.fau.de/gnu/taler/exchange-${EXCHANGE_VERSION}.tar.gz}"
-MERCHANT_URL="${MERCHANT_TARBALL_URL:-https://ftp.fau.de/gnu/taler/merchant-${MERCHANT_VERSION}.tar.gz}"
+EXCHANGE_URL="${EXCHANGE_TARBALL_URL:-https://ftp.fau.de/gnu/taler/taler-exchange-${EXCHANGE_VERSION}.tar.gz}"
+MERCHANT_URL="${MERCHANT_TARBALL_URL:-https://ftp.fau.de/gnu/taler/taler-merchant-${MERCHANT_VERSION}.tar.gz}"
 LIBEUFIN_URL="${LIBEUFIN_TARBALL_URL:-https://ftp.fau.de/gnu/taler/libeufin-${LIBEUFIN_VERSION}.tar.gz}"
 
 fetch() {