-improve build logic

11 files changed, 105 insertions, 139 deletions

diff --git a/.gitignore b/.gitignore
index 1223f074f..8c63d03da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -166,3 +166,4 @@ src/exchange/taler-exchange-drain
 src/kyclogic/taler-exchange-kyc-tester
 src/auditor/exchange-httpd-drain.err
 src/templating/libmustach.a
+contrib/tos/conf.py
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index aae1473b8..6213ac36a 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -25,18 +25,18 @@ ppendir=$(datadir)/taler/exchange/pp/en
 rdatadir=$(datadir)/taler/exchange
 
 tosen_DATA = \
-  tos/en/0.txt \
-  tos/en/0.pdf \
-  tos/en/0.epub \
-  tos/en/0.xml \
-  tos/en/0.html
+  tos/en/*.txt \
+  tos/en/*.pdf \
+  tos/en/*.epub \
+  tos/en/*.xml \
+  tos/en/*.html
 
 ppen_DATA = \
-  pp/en/0.txt \
-  pp/en/0.pdf \
-  pp/en/0.epub \
-  pp/en/0.xml \
-  pp/en/0.html
+  pp/en/*.txt \
+  pp/en/*.pdf \
+  pp/en/*.epub \
+  pp/en/*.xml \
+  pp/en/*.html
 
 rdata_DATA = \
   auditor-report.tex.j2
@@ -56,8 +56,9 @@ EXTRA_DIST = \
   gana/gnu-taler-error-codes/Makefile \
   tos/Makefile \
   tos/README \
+  tos/bfh.rst \
   tos/tos.rst \
-  tos/conf.py \
+  tos/conf.py.in \
   tos/locale/de/LC_MESSAGES/tos.po \
   pp/Makefile \
   pp/README \
diff --git a/contrib/tos/conf.py b/contrib/tos/conf.py.in
index 29392556f..064c4b06f 100644
--- a/contrib/tos/conf.py
+++ b/contrib/tos/conf.py.in
@@ -17,6 +17,7 @@
   @author Benedikt Muller
   @author Sree Harsha Totakura
   @author Marcello Stanisci
+  @author Christian Grothoff
 """
 # -*- coding: utf-8 -*-
 #
@@ -68,11 +69,11 @@ source_suffix = {
 #source_encoding = 'utf-8-sig'
 
 # The master toctree document.
-master_doc = 'tos'
+master_doc = '%VERSION%'
 
 # General information about the project.
-project = u'tos'
-copyright = u'2014-2020 Taler Systems SA (GPLv3+ or GFDL 1.3+)'
+project = u'%VERSION%'
+copyright = u'2014-2022 Taler Systems SA (GPLv3+ or GFDL 1.3+)'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -231,7 +232,7 @@ latex_elements = {
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
-    ('tos', 'tos.tex',
+    ('%VERSION%', '%VERSION%.tex',
      'Terms of Service', 'GNU Taler team', 'manual'),
 ]
 
@@ -277,6 +278,6 @@ latex_documents = [
 
 # -- Options for epub output  ----------------------------
 
-epub_basename = "tos"
+epub_basename = "%VERSION%"
 
 epub_title = "Terms of Service"
diff --git a/contrib/tos/en/0.pdf b/contrib/tos/en/0.pdf
deleted file mode 100644
index f145a83a4..000000000
--- a/contrib/tos/en/0.pdf
+++ /dev/null
diff --git a/contrib/tos/en/0.epub b/contrib/tos/en/tos.epub
index 4417674e6..5fc98c3c2 100644
--- a/contrib/tos/en/0.epub
+++ b/contrib/tos/en/tos.epub
diff --git a/contrib/tos/en/0.html b/contrib/tos/en/tos.html
index 0a1c1d331..6e7f66f52 100644
--- a/contrib/tos/en/0.html
+++ b/contrib/tos/en/tos.html
@@ -20,21 +20,11 @@
             
   <div class="section" id="terms-of-service">
 <h1>Terms Of Service<a class="headerlink" href="#terms-of-service" title="Permalink to this headline">¶</a></h1>
-<p>Last Updated: 09.06.2022</p>
-<p>Welcome! The ICE research center of the Bern University of Applied Sciences
-in Switzerland (“we,” “our,” or “us”) provides an experimental payment service
+<p>Last Updated: 12.4.2019</p>
+<p>Welcome! Taler Systems SA (“we,” “our,” or “us”) provides a payment service
 through our Internet presence (collectively the “Services”). Before using our
 Services, please read the Terms of Service (the “Terms” or the “Agreement”)
 carefully.</p>
-<div class="section" id="this-is-research">
-<h2>This is research<a class="headerlink" href="#this-is-research" title="Permalink to this headline">¶</a></h2>
-<p>This is a research experiment. Any funds wired to our Bitcoin address are
-considered a donation to our research group. We may use them to enable
-payments following the GNU Taler protocol, or simply keep them at our
-discretion.  The service is experimental and may also be discontinued at
-any time, in which case all remaining funds will definitively be kept by
-the research group.</p>
-</div>
 <div class="section" id="overview">
 <h2>Overview<a class="headerlink" href="#overview" title="Permalink to this headline">¶</a></h2>
 <p>This section provides a brief summary of the highlights of this
@@ -51,12 +41,10 @@ carefully.</p>
 <li><p>You are responsible for keeping the data in your Taler Wallet at all times
 under your control. Any losses arising from you not being in control of
 your private information are your problem.</p></li>
-<li><p>We may transfer funds we receive from our users to any legal
+<li><p>We will try to transfer funds we hold in escrow for our users to any legal
 recipient to the best of our ability within the limitations of the law and
 our implementation. However, the Services offered today are highly
-experimental and the set of recipients of funds is severely restricted.
-Again, we stress this is a research experiment and technically all funds
-held by the exchange are owned by the research group of the university.</p></li>
+experimental and the set of recipients of funds is severely restricted.</p></li>
 <li><p>For our Services, we may charge transaction fees. The specific fee structure
 is provided based on the Taler protocol and should be shown to you when you
 withdraw electronic coins using a Taler Wallet. You agree and understand
@@ -64,8 +52,8 @@ that the Taler protocol allows for the fee structure to change.</p></li>
 <li><p>You agree to not intentionally overwhelm our systems with requests and
 follow responsible disclosure if you find security issues in our services.</p></li>
 <li><p>We cannot be held accountable for our Services not being available due to
-any circumstances. If we modify or terminate our services,
-we may give you the opportunity to recover your funds. However,
+circumstances beyond our control. If we modify or terminate our services,
+we will try to give you the opportunity to recover your funds. However,
 given the experimental state of the Services today, this may not be
 possible. You are strongly advised to limit your use of the Service
 to small-scale experiments expecting total loss of all funds.</p></li>
@@ -74,7 +62,7 @@ to small-scale experiments expecting total loss of all funds.</p></li>
 <p>These terms outline approved uses of our Services. The Services and these
 Terms are still at an experimental stage. If you have any questions or
 comments related to this Agreement, please send us a message to
-<a class="reference external" href="mailto:ice&#37;&#52;&#48;bfh&#46;ch">ice<span>&#64;</span>bfh<span>&#46;</span>ch</a>. If you do not agree to this Agreement, you must not
+<a class="reference external" href="mailto:legal&#37;&#52;&#48;taler-systems&#46;com">legal<span>&#64;</span>taler-systems<span>&#46;</span>com</a>. If you do not agree to this Agreement, you must not
 use our Services.</p>
 </div>
 </div>
@@ -94,26 +82,26 @@ have last reviewed these Terms.</p>
 </div>
 <div class="section" id="services">
 <h2>Services<a class="headerlink" href="#services" title="Permalink to this headline">¶</a></h2>
-<p>We will try to transfer funds that we receive from users to any legal
-recipient to the best of our ability and within the limitations of the
-law. However, the Services offered today are highly experimental and the set
-of recipients of funds is severely restricted.  The Taler Wallet can be loaded
-by exchanging fiat or cryptocurrencies against electronic coins. We are
-providing this exchange service. Once your Taler Wallet is loaded with
-electronic coins they can be spent for purchases if the seller is accepting
-Taler as a means of payment. We are not guaranteeing that any seller is
-accepting Taler at all or a particular seller.  The seller or recipient of
+<p>We will try to transfer funds that we hold in escrow for our users to any
+legal recipient to the best of our ability and within the limitations of the
+law and our implementation. However, the Services offered today are highly
+experimental and the set of recipients of funds is severely restricted.  The
+Taler Wallet can be loaded by exchanging fiat currencies against electronic
+coins. We are providing this exchange service. Once your Taler Wallet is
+loaded with electronic coins they can be spent for purchases if the seller is
+accepting Taler as a means of payment. We are not guaranteeing that any seller
+is accepting Taler at all or a particular seller.  The seller or recipient of
 deposits of electronic coins must specify the target account, as per the
 design of the Taler protocol. They are responsible for following the protocol
 and specifying the correct bank account, and are solely liable for any losses
-that may arise from specifying the wrong account. We may allow the government
+that may arise from specifying the wrong account. We will allow the government
 to link wire transfers to the underlying contract hash. It is the
 responsibility of recipients to preserve the full contracts and to pay
 whatever taxes and charges may be applicable. Technical issues may lead to
 situations where we are unable to make transfers at all or lead to incorrect
-transfers that cannot be reversed. We may refuse to execute transfers if the
-transfers are prohibited by a competent legal authority and we are ordered to
-do so.</p>
+transfers that cannot be reversed. We will only refuse to execute transfers if
+the transfers are prohibited by a competent legal authority and we are ordered
+to do so.</p>
 <p>When using our Services, you agree to not take any action that intentionally
 imposes an unreasonable load on our infrastructure. If you find security
 problems in our Services, you agree to first report them to
@@ -279,7 +267,7 @@ the validity and enforceability of any remaining provisions.</p>
 Terms. If any provisions of these Terms are inconsistent with any applicable
 law, those provisions will be superseded or modified only to the extent such
 provisions are inconsistent. The parties agree to submit to the ordinary
-courts in Bern, Switzerland for exclusive jurisdiction of any dispute
+courts in Zurich, Switzerland for exclusive jurisdiction of any dispute
 arising out of or related to your use of the Services or your breach of these
 Terms.</p>
 <p>Our failure to exercise or delay in exercising any right, power, or privilege
diff --git a/contrib/tos/en/tos.pdf b/contrib/tos/en/tos.pdf
new file mode 100644
index 000000000..8e42e3664
--- /dev/null
+++ b/contrib/tos/en/tos.pdf
diff --git a/contrib/tos/en/0.txt b/contrib/tos/en/tos.txt
index 19db09844..c124d70ee 100644
--- a/contrib/tos/en/0.txt
+++ b/contrib/tos/en/tos.txt
@@ -1,24 +1,12 @@
 Terms Of Service
 ****************
 
-Last Updated: 09.06.2022
+Last Updated: 12.4.2019
 
-Welcome! The ICE research center of the Bern University of Applied
-Sciences in Switzerland (“we,” “our,” or “us”) provides an
-experimental payment service through our Internet presence
-(collectively the “Services”). Before using our Services, please read
-the Terms of Service (the “Terms” or the “Agreement”) carefully.
-
-
-This is research
-================
-
-This is a research experiment. Any funds wired to our Bitcoin address
-are considered a donation to our research group. We may use them to
-enable payments following the GNU Taler protocol, or simply keep them
-at our discretion.  The service is experimental and may also be
-discontinued at any time, in which case all remaining funds will
-definitively be kept by the research group.
+Welcome! Taler Systems SA (“we,” “our,” or “us”) provides a payment
+service through our Internet presence (collectively the “Services”).
+Before using our Services, please read the Terms of Service (the
+“Terms” or the “Agreement”) carefully.
 
 
 Overview
@@ -40,13 +28,11 @@ Highlights:
      all times under your control. Any losses arising from you not
      being in control of your private information are your problem.
 
-   * We may transfer funds we receive from our users to any legal
-     recipient to the best of our ability within the limitations of
-     the law and our implementation. However, the Services offered
-     today are highly experimental and the set of recipients of funds
-     is severely restricted. Again, we stress this is a research
-     experiment and technically all funds held by the exchange are
-     owned by the research group of the university.
+   * We will try to transfer funds we hold in escrow for our users to
+     any legal recipient to the best of our ability within the
+     limitations of the law and our implementation. However, the
+     Services offered today are highly experimental and the set of
+     recipients of funds is severely restricted.
 
    * For our Services, we may charge transaction fees. The specific
      fee structure is provided based on the Taler protocol and should
@@ -59,18 +45,19 @@ Highlights:
      issues in our services.
 
    * We cannot be held accountable for our Services not being
-     available due to any circumstances. If we modify or terminate our
-     services, we may give you the opportunity to recover your funds.
-     However, given the experimental state of the Services today, this
-     may not be possible. You are strongly advised to limit your use
-     of the Service to small-scale experiments expecting total loss of
-     all funds.
+     available due to circumstances beyond our control. If we modify
+     or terminate our services, we will try to give you the
+     opportunity to recover your funds. However, given the
+     experimental state of the Services today, this may not be
+     possible. You are strongly advised to limit your use of the
+     Service to small-scale experiments expecting total loss of all
+     funds.
 
 These terms outline approved uses of our Services. The Services and
 these Terms are still at an experimental stage. If you have any
 questions or comments related to this Agreement, please send us a
-message to ice@bfh.ch. If you do not agree to this Agreement, you must
-not use our Services.
+message to legal@taler-systems.com. If you do not agree to this
+Agreement, you must not use our Services.
 
 
 How you accept this policy
@@ -93,25 +80,26 @@ since you have last reviewed these Terms.
 Services
 ========
 
-We will try to transfer funds that we receive from users to any legal
-recipient to the best of our ability and within the limitations of the
-law. However, the Services offered today are highly experimental and
-the set of recipients of funds is severely restricted.  The Taler
-Wallet can be loaded by exchanging fiat or cryptocurrencies against
-electronic coins. We are providing this exchange service. Once your
-Taler Wallet is loaded with electronic coins they can be spent for
-purchases if the seller is accepting Taler as a means of payment. We
-are not guaranteeing that any seller is accepting Taler at all or a
-particular seller.  The seller or recipient of deposits of electronic
-coins must specify the target account, as per the design of the Taler
-protocol. They are responsible for following the protocol and
-specifying the correct bank account, and are solely liable for any
-losses that may arise from specifying the wrong account. We may allow
-the government to link wire transfers to the underlying contract hash.
-It is the responsibility of recipients to preserve the full contracts
-and to pay whatever taxes and charges may be applicable. Technical
-issues may lead to situations where we are unable to make transfers at
-all or lead to incorrect transfers that cannot be reversed. We may
+We will try to transfer funds that we hold in escrow for our users to
+any legal recipient to the best of our ability and within the
+limitations of the law and our implementation. However, the Services
+offered today are highly experimental and the set of recipients of
+funds is severely restricted.  The Taler Wallet can be loaded by
+exchanging fiat currencies against electronic coins. We are providing
+this exchange service. Once your Taler Wallet is loaded with
+electronic coins they can be spent for purchases if the seller is
+accepting Taler as a means of payment. We are not guaranteeing that
+any seller is accepting Taler at all or a particular seller.  The
+seller or recipient of deposits of electronic coins must specify the
+target account, as per the design of the Taler protocol. They are
+responsible for following the protocol and specifying the correct bank
+account, and are solely liable for any losses that may arise from
+specifying the wrong account. We will allow the government to link
+wire transfers to the underlying contract hash. It is the
+responsibility of recipients to preserve the full contracts and to pay
+whatever taxes and charges may be applicable. Technical issues may
+lead to situations where we are unable to make transfers at all or
+lead to incorrect transfers that cannot be reversed. We will only
 refuse to execute transfers if the transfers are prohibited by a
 competent legal authority and we are ordered to do so.
 
@@ -318,7 +306,7 @@ No matter where you’re located, the laws of Switzerland will govern
 these Terms. If any provisions of these Terms are inconsistent with
 any applicable law, those provisions will be superseded or modified
 only to the extent such provisions are inconsistent. The parties agree
-to submit to the ordinary courts in Bern, Switzerland for exclusive
+to submit to the ordinary courts in Zurich, Switzerland for exclusive
 jurisdiction of any dispute arising out of or related to your use of
 the Services or your breach of these Terms.
 
diff --git a/contrib/tos/en/0.xml b/contrib/tos/en/tos.xml
index 7f42db04d..ee93a4cc1 100644
--- a/contrib/tos/en/0.xml
+++ b/contrib/tos/en/tos.xml
@@ -1,24 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE document PUBLIC "+//IDN docutils.sourceforge.net//DTD Docutils Generic//EN//XML" "http://docutils.sourceforge.net/docs/ref/docutils.dtd">
 <!-- Generated by Docutils 0.16 -->
-<document source="/home/grothoff/research/taler/exchange/contrib/tos/tos.rst">
+<document source="/research/taler/exchange/contrib/tos/tos.rst">
     <section ids="terms-of-service" names="terms\ of\ service">
         <title>Terms Of Service</title>
-        <paragraph>Last Updated: 09.06.2022</paragraph>
-        <paragraph>Welcome! The ICE research center of the Bern University of Applied Sciences
-            in Switzerland (“we,” “our,” or “us”) provides an experimental payment service
+        <paragraph>Last Updated: 12.4.2019</paragraph>
+        <paragraph>Welcome! Taler Systems SA (“we,” “our,” or “us”) provides a payment service
             through our Internet presence (collectively the “Services”). Before using our
             Services, please read the Terms of Service (the “Terms” or the “Agreement”)
             carefully.</paragraph>
-        <section ids="this-is-research" names="this\ is\ research">
-            <title>This is research</title>
-            <paragraph>This is a research experiment. Any funds wired to our Bitcoin address are
-                considered a donation to our research group. We may use them to enable
-                payments following the GNU Taler protocol, or simply keep them at our
-                discretion.  The service is experimental and may also be discontinued at
-                any time, in which case all remaining funds will definitively be kept by
-                the research group.</paragraph>
-        </section>
         <section ids="overview" names="overview">
             <title>Overview</title>
             <paragraph>This section provides a brief summary of the highlights of this
@@ -38,12 +28,10 @@
                                 your private information are your problem.</paragraph>
                         </list_item>
                         <list_item>
-                            <paragraph>We may transfer funds we receive from our users to any legal
+                            <paragraph>We will try to transfer funds we hold in escrow for our users to any legal
                                 recipient to the best of our ability within the limitations of the law and
                                 our implementation. However, the Services offered today are highly
-                                experimental and the set of recipients of funds is severely restricted.
-                                Again, we stress this is a research experiment and technically all funds
-                                held by the exchange are owned by the research group of the university.</paragraph>
+                                experimental and the set of recipients of funds is severely restricted.</paragraph>
                         </list_item>
                         <list_item>
                             <paragraph>For our Services, we may charge transaction fees. The specific fee structure
@@ -57,8 +45,8 @@
                         </list_item>
                         <list_item>
                             <paragraph>We cannot be held accountable for our Services not being available due to
-                                any circumstances. If we modify or terminate our services,
-                                we may give you the opportunity to recover your funds. However,
+                                circumstances beyond our control. If we modify or terminate our services,
+                                we will try to give you the opportunity to recover your funds. However,
                                 given the experimental state of the Services today, this may not be
                                 possible. You are strongly advised to limit your use of the Service
                                 to small-scale experiments expecting total loss of all funds.</paragraph>
@@ -68,7 +56,7 @@
                 <paragraph>These terms outline approved uses of our Services. The Services and these
                     Terms are still at an experimental stage. If you have any questions or
                     comments related to this Agreement, please send us a message to
-                    <reference refuri="mailto:ice@bfh.ch">ice@bfh.ch</reference>. If you do not agree to this Agreement, you must not
+                    <reference refuri="mailto:legal@taler-systems.com">legal@taler-systems.com</reference>. If you do not agree to this Agreement, you must not
                     use our Services.</paragraph>
             </section>
         </section>
@@ -88,26 +76,26 @@
         </section>
         <section ids="services" names="services">
             <title>Services</title>
-            <paragraph>We will try to transfer funds that we receive from users to any legal
-                recipient to the best of our ability and within the limitations of the
-                law. However, the Services offered today are highly experimental and the set
-                of recipients of funds is severely restricted.  The Taler Wallet can be loaded
-                by exchanging fiat or cryptocurrencies against electronic coins. We are
-                providing this exchange service. Once your Taler Wallet is loaded with
-                electronic coins they can be spent for purchases if the seller is accepting
-                Taler as a means of payment. We are not guaranteeing that any seller is
-                accepting Taler at all or a particular seller.  The seller or recipient of
+            <paragraph>We will try to transfer funds that we hold in escrow for our users to any
+                legal recipient to the best of our ability and within the limitations of the
+                law and our implementation. However, the Services offered today are highly
+                experimental and the set of recipients of funds is severely restricted.  The
+                Taler Wallet can be loaded by exchanging fiat currencies against electronic
+                coins. We are providing this exchange service. Once your Taler Wallet is
+                loaded with electronic coins they can be spent for purchases if the seller is
+                accepting Taler as a means of payment. We are not guaranteeing that any seller
+                is accepting Taler at all or a particular seller.  The seller or recipient of
                 deposits of electronic coins must specify the target account, as per the
                 design of the Taler protocol. They are responsible for following the protocol
                 and specifying the correct bank account, and are solely liable for any losses
-                that may arise from specifying the wrong account. We may allow the government
+                that may arise from specifying the wrong account. We will allow the government
                 to link wire transfers to the underlying contract hash. It is the
                 responsibility of recipients to preserve the full contracts and to pay
                 whatever taxes and charges may be applicable. Technical issues may lead to
                 situations where we are unable to make transfers at all or lead to incorrect
-                transfers that cannot be reversed. We may refuse to execute transfers if the
-                transfers are prohibited by a competent legal authority and we are ordered to
-                do so.</paragraph>
+                transfers that cannot be reversed. We will only refuse to execute transfers if
+                the transfers are prohibited by a competent legal authority and we are ordered
+                to do so.</paragraph>
             <paragraph>When using our Services, you agree to not take any action that intentionally
                 imposes an unreasonable load on our infrastructure. If you find security
                 problems in our Services, you agree to first report them to
@@ -295,7 +283,7 @@
                 Terms. If any provisions of these Terms are inconsistent with any applicable
                 law, those provisions will be superseded or modified only to the extent such
                 provisions are inconsistent. The parties agree to submit to the ordinary
-                courts in Bern, Switzerland for exclusive jurisdiction of any dispute
+                courts in Zurich, Switzerland for exclusive jurisdiction of any dispute
                 arising out of or related to your use of the Services or your breach of these
                 Terms.</paragraph>
             <paragraph>Our failure to exercise or delay in exercising any right, power, or privilege
diff --git a/contrib/update-tos.sh b/contrib/update-tos.sh
index 47d3af778..81636be50 100755
--- a/contrib/update-tos.sh
+++ b/contrib/update-tos.sh
@@ -15,6 +15,7 @@ for l in $@
 do
     mkdir -p $l
     echo Generating TOS for language $l
+    cat conf.py.in | sed -e "s/%VERSION%/$VERSION/g" > conf.py
     # 'f' is for the supported formats, note that the 'make' target
     # MUST match the file extension.
     for f in html txt pdf epub xml
@@ -22,7 +23,8 @@ do
         rm -rf _build
         echo "  Generating format $f"
         make -e SPHINXOPTS="-D language='$l'" $f >>sphinx.log 2>>sphinx.err < /dev/null
-        mv _build/$f/tos.$f $l/${VERSION}.$f
+        mv _build/$f/${VERSION}.$f $l/${VERSION}.$f
     done
 done
 cd ..
+echo "Success"
diff --git a/src/exchangedb/Makefile.am b/src/exchangedb/Makefile.am
index 61b18d137..54f51e9a3 100644
--- a/src/exchangedb/Makefile.am
+++ b/src/exchangedb/Makefile.am
@@ -52,9 +52,6 @@ shard-0001.sql: common-0001.sql shard-0001-part.sql exchange-0001.sql.in
 EXTRA_DIST = \
   exchangedb.conf \
   exchangedb-postgres.conf \
-  plugin_exchangedb_common.c \
-  irbt_callbacks.c \
-  lrbt_callbacks.c \
   bench-db-postgres.conf \
   test-exchange-db-postgres.conf \
   $(sqlinputs) \