merchant

commit fda894cbf1a0ef9bcd71365a31991dbd537b4563
parent c3eca1b551fe824e02c26bdd2e8f98cf75b605aa
Author: bohdan-potuzhnyi <bohdan.potuzhnyi@gmail.com>
Date:   Thu, 31 Jul 2025 12:15:34 +0200

Merge branch 'master' into dev/bohdan-potuzhnyi/donau-integration

Diffstat:
M
configure.ac
 | 
2
+-
M
contrib/merchant-spa.lock
 | 
2
+-
M
debian/changelog
 | 
24
++++++++++++++++++++++++
M
debian/control
 | 
2
++
M
debian/taler-merchant.postinst
 | 
4
++--
M
doc/doxygen/taler.doxy
 | 
2
+-
M
src/backenddb/pg_update_token_family.c
 | 
5
++++-

7 files changed, 35 insertions(+), 6 deletions(-)
diff --git a/configure.ac b/configure.ac
@@ -18,7 +18,7 @@
 # This configure file is in the public domain
 
 AC_PREREQ([2.69])
-AC_INIT([taler-merchant],[1.0.7],[taler-bug@gnunet.org])
+AC_INIT([taler-merchant],[1.0.9],[taler-bug@gnunet.org])
 AC_CONFIG_SRCDIR([src/backend/taler-merchant-httpd.c])
 AC_CONFIG_HEADERS([taler_merchant_config.h])
 # support for non-recursive builds
diff --git a/contrib/merchant-spa.lock b/contrib/merchant-spa.lock
@@ -1 +1 @@
-1.0.18
+1.0.26
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,27 @@
+taler-merchant (1.0.9-4) unstable; urgency=low
+
+  * Release 1.0.9-4.
+
+ -- Iván Ávalos <avalos@disroot.org>  Thu, 31 Jul 2025 01:55:56 +0200
+
+taler-merchant (1.0.9-3) unstable; urgency=low
+
+  * Release 1.0.9-3.
+
+ -- Iván Ávalos <avalos@disroot.org>  Thu, 31 Jul 2025 01:38:12 +0200
+
+taler-merchant (1.0.9-2) unstable; urgency=low
+
+  * Release 1.0.9-2.
+
+ -- Iván Ávalos <avalos@disroot.org>  Thu, 31 Jul 2025 01:29:21 +0200
+
+taler-merchant (1.0.9-1) unstable; urgency=low
+
+  * Release 1.0.9.
+
+ -- Florian Dold <florian@dold.me>  Wed, 30 Jul 2025 11:41:33 +0200
+
 taler-merchant (1.0.7) unstable; urgency=low
 
   * Release 1.0.7.
diff --git a/debian/control b/debian/control
@@ -52,6 +52,8 @@ Depends:
  adduser,
  lsb-base,
  netbase,
+ gzip,
+ zstd,
  ${misc:Depends},
  ${shlibs:Depends}
 Recommends:
diff --git a/debian/taler-merchant.postinst b/debian/taler-merchant.postinst
@@ -84,8 +84,8 @@ configure)
   for n in index.html index.css index.js lang.js
   do
       TDIR="/usr/share/taler-merchant/"
-      gzip --best - < "${TDIR}/spa/$n" > "${TDIR}/spa/$n.gz" || true
-      zstd -19 - < "${TDIR}/spa/$n" > "${TDIR}/spa/$n.zstd" || true
+      gzip --best - < "${TDIR}/spa/$n" > "${TDIR}/spa/$n.gz" || rm -f "${TDIR}/spa/$n.gz"
+      zstd -19 - < "${TDIR}/spa/$n" > "${TDIR}/spa/$n.zstd" || rm -f "${TDIR}/spa/$n.zstd"
   done
 
   ;;
diff --git a/doc/doxygen/taler.doxy b/doc/doxygen/taler.doxy
@@ -5,7 +5,7 @@
 #---------------------------------------------------------------------------
 DOXYFILE_ENCODING      = UTF-8
 PROJECT_NAME           = "GNU Taler: Merchant"
-PROJECT_NUMBER         = 1.0.7
+PROJECT_NUMBER         = 1.0.9
 PROJECT_LOGO           = logo.svg
 OUTPUT_DIRECTORY       = .
 CREATE_SUBDIRS         = YES
diff --git a/src/backenddb/pg_update_token_family.c b/src/backenddb/pg_update_token_family.c
@@ -18,6 +18,7 @@
  * @brief Implementation of the update_token_family function for Postgres
  * @author Christian Blättler
  */
+#include "gnunet/gnunet_pq_lib.h"
 #include "platform.h"
 #include <taler/taler_error_codes.h>
 #include <taler/taler_dbevents.h>
@@ -41,7 +42,9 @@ TMH_PG_update_token_family (
     GNUNET_PQ_query_param_string (details->name),
     GNUNET_PQ_query_param_string (details->description),
     TALER_PQ_query_param_json (details->description_i18n),
-    TALER_PQ_query_param_json (details->extra_data),
+    (details->extra_data == NULL)
+    ? GNUNET_PQ_query_param_null ()
+    : TALER_PQ_query_param_json (details->extra_data),
     GNUNET_PQ_query_param_timestamp (&details->valid_after),
     GNUNET_PQ_query_param_timestamp (&details->valid_before),
     GNUNET_PQ_query_param_end