diff options
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/ci/Containerfile | 44 | ||||
| -rwxr-xr-x | contrib/ci/jobs/2-test/test.sh | 13 | ||||
| -rwxr-xr-x | contrib/ci/jobs/4-deb-package/version.sh | 4 | ||||
| -rw-r--r-- | contrib/exchange-tos-bfh-v0.rst | 57 | ||||
| -rw-r--r-- | contrib/exchange-tos-tops-v0.rst | 132 | ||||
| -rw-r--r-- | contrib/exchange-tos-v0.rst | 23 | ||||
| m--------- | contrib/gana | 0 | ||||
| -rw-r--r-- | contrib/locale/de/LC_MESSAGES/exchange-tos-v0.po | 2 | ||||
| m--------- | contrib/wallet-core | 0 |
9 files changed, 207 insertions, 68 deletions
diff --git a/contrib/ci/Containerfile b/contrib/ci/Containerfile index d4e5584f7..ac31c7ade 100644 --- a/contrib/ci/Containerfile +++ b/contrib/ci/Containerfile @@ -7,42 +7,44 @@ RUN apt-get update -yqq && \ autoconf \ autopoint \ curl \ - git \ + bash \ + coreutils \ + git \ libcurl4-gnutls-dev \ libgcrypt-dev \ libidn11-dev \ libjansson-dev \ - libmicrohttpd-dev \ + libmicrohttpd-dev \ libpq-dev \ libqrencode-dev \ - libsodium-dev \ - libtool \ + libsodium-dev \ + libtool \ libunistring-dev \ make \ pkg-config \ python3-pip \ python3-sphinx \ python3-sphinx-rtd-theme \ - recutils \ - texinfo \ + recutils \ + texinfo \ zlib1g-dev \ # For mustach testing (optional) \ libjson-c-dev \ - # Debian packaging tools \ - po-debconf \ - build-essential \ - debhelper-compat \ - devscripts \ + # Debian packaging tools \ + po-debconf \ + build-essential \ + debhelper-compat \ + devscripts \ git-buildpackage \ # Documentation dependencies \ - doxygen \ - graphviz \ - pandoc \ + doxygen \ + graphviz \ + pandoc \ # Test suite dependencies \ jq \ - postgresql \ - sudo \ - wget + postgresql \ + sudo \ + wget # Install Taler (and friends) packages RUN curl -sS https://deb.taler.net/apt-nightly/taler-bookworm-ci.sources \ @@ -56,10 +58,10 @@ Pin-Priority: 999' > /etc/apt/preferences.d/taler RUN cat /etc/apt/preferences.d/taler && \ apt-get update -y && \ apt-get install -y \ - libgnunet-dev \ - libgnunet \ - gnunet \ -&& rm -rf /var/lib/apt/lists/* + libgnunet-dev \ + libgnunet \ + gnunet \ + && rm -rf /var/lib/apt/lists/* WORKDIR /workdir diff --git a/contrib/ci/jobs/2-test/test.sh b/contrib/ci/jobs/2-test/test.sh index 6566e7e08..a0002f226 100755 --- a/contrib/ci/jobs/2-test/test.sh +++ b/contrib/ci/jobs/2-test/test.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -evu +set -evux apt-get update apt-get upgrade -yqq @@ -10,6 +10,12 @@ apt-get upgrade -yqq --disable-doc nump=$(grep processor /proc/cpuinfo | wc -l) +make clean +make -j$(( $nump / 2 )) +cd src/templating/ +./run-original-tests.sh +make clean +cd - make -j$(( $nump / 2 )) make install @@ -26,11 +32,14 @@ check_command() print_logs() { + set +e for i in src/*/test-suite.log do + echo "Printing ${i}" + cat "$i" for FAILURE in $(grep '^FAIL:' ${i} | cut -d' ' -f2) do - echo "Printing ${FAILURE}.log" + echo "Printing $(dirname $i)/${FAILURE}.log" cat "$(dirname $i)/${FAILURE}.log" done done diff --git a/contrib/ci/jobs/4-deb-package/version.sh b/contrib/ci/jobs/4-deb-package/version.sh index d2647785e..52031b23a 100755 --- a/contrib/ci/jobs/4-deb-package/version.sh +++ b/contrib/ci/jobs/4-deb-package/version.sh @@ -7,10 +7,10 @@ if [ -z "${BRANCH}" ]; then else # "Unshallow" our checkout, but only our current branch, and exclude the submodules. git fetch --no-recurse-submodules --tags --depth=1000 origin "${BRANCH}" - RECENT_VERSION_TAG=$(git describe --tags --match 'v*.*.*' --always --abbrev=0 HEAD || exit 1) + RECENT_VERSION_TAG=$(git describe --tags --match 'v*.*.*' --exclude '*-dev*' --always --abbrev=0 HEAD || exit 1) commits="$(git rev-list ${RECENT_VERSION_TAG}..HEAD --count)" if [ "${commits}" = "0" ]; then - git describe --tag HEAD || exit 1 + git describe --tag HEAD | sed -r 's/^v//' || exit 1 else echo $(echo ${RECENT_VERSION_TAG} | sed -r 's/^v//')-${commits}-$(git rev-parse --short=8 HEAD) fi diff --git a/contrib/exchange-tos-bfh-v0.rst b/contrib/exchange-tos-bfh-v0.rst index 85f041c33..33a2b76f7 100644 --- a/contrib/exchange-tos-bfh-v0.rst +++ b/contrib/exchange-tos-bfh-v0.rst @@ -1,7 +1,7 @@ -Terms Of Service +Terms of Service ================ -Last Updated: 09.06.2022 +Last update: 26.04.2024 Welcome! The ICE research center of the Bern University of Applied Sciences in Switzerland (“we,” “our,” or “us”) provides an experimental payment service @@ -34,22 +34,22 @@ carefully. Highlights: ~~~~~~~~~~~ - • You are responsible for keeping the data in your Taler Wallet at all times +* 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. - • We may transfer funds we receive from our users to any legal +* 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. - • For our Services, we may charge transaction fees. The specific fee structure +* 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 that the Taler protocol allows for the fee structure to change. - • You agree to not intentionally overwhelm our systems with requests and +* You agree to not intentionally overwhelm our systems with requests and follow responsible disclosure if you find security issues in our services. - • We cannot be held accountable for our Services not being available due to +* 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 @@ -152,7 +152,7 @@ modified or unmodified form. However, the GPL is a strong copyleft license, which means that any derivative works must be distributed under the same license terms as the original software. If you have any questions, you should review the GNU GPL’s full terms and conditions at -https://www.gnu.org/licenses/gpl-3.0.en.html. “Taler” itself is a trademark +https://www.gnu.org/licenses/. “Taler” itself is a trademark of Taler Systems SA. You are welcome to use the name in relation to processing payments using the Taler protocol, assuming your use is compatible with an official release from the GNU Project that is not older than two years. @@ -171,15 +171,13 @@ Taler Wallet, including, but not limited to your Taler Wallet coins or backup encryption keys. You release us from all liability related to any losses, damages, or claims arising from: -(a) user error such as forgotten passwords, incorrectly constructed - transactions; -(b) server failure or data loss; -(c) unauthorized access to the Taler Wallet application; -(d) bugs or other errors in the Taler Wallet software; and -(e) any unauthorized third party activities, including, but not limited to, - the use of viruses, phishing, brute forcing, or other means of attack - against the Taler Wallet. We make no representations concerning any - Third Party Content contained in or accessed through our Services. +1) user error such as forgotten passwords, incorrectly constructed transactions; +2) server failure or data loss; +3) unauthorized access to the Taler Wallet application; +4) bugs or other errors in the Taler Wallet software; and +5) any unauthorized third party activities, including, but not limited to, the use of +viruses, phishing, brute forcing, or other means of attack against the Taler Wallet. We make no +representations concerning any Third Party Content contained in or accessed through our Services. Any other terms, conditions, warranties, or representations associated with such content, are solely between you and such organizations and/or @@ -192,19 +190,18 @@ acting, or purporting to act on our behalf (collectively the “Taler Parties” be liable to you under contract, tort, strict liability, negligence, or any other legal or equitable theory, for: -(a) any lost profits, data loss, cost of procurement of substitute goods or - services, or direct, indirect, incidental, special, punitive, compensatory, - or consequential damages of any kind whatsoever resulting from: - - (i) your use of, or conduct in connection with, our services; - (ii) any unauthorized use of your wallet and/or private key due to your - failure to maintain the confidentiality of your wallet; - (iii) any interruption or cessation of transmission to or from the services; or - (iv) any bugs, viruses, trojan horses, or the like that are found in the Taler - Wallet software or that may be transmitted to or through our services by - any third party (regardless of the source of origination), or - -(b) any direct damages. +1) any direct damages or +2) any lost profits, data loss, cost of procurement of substitute goods or services, or +direct, indirect, incidental, special, punitive, compensatory, or consequential damages of any kind +whatsoever resulting from: + +* your use of, or conduct in connection with, our services; +* any unauthorized use of your wallet and/or private key due to your failure to maintain the +confidentiality of your wallet; +* any interruption or cessation of transmission to or from the services; or +* any bugs, viruses, trojan horses, or the like that are found in the Taler Wallet software +or that may be transmitted to or through our services by any third party (regardless of the source +of origination). These limitations apply regardless of legal theory, whether based on tort, strict liability, breach of contract, breach of warranty, or any other legal diff --git a/contrib/exchange-tos-tops-v0.rst b/contrib/exchange-tos-tops-v0.rst new file mode 100644 index 000000000..9007e0aa7 --- /dev/null +++ b/contrib/exchange-tos-tops-v0.rst @@ -0,0 +1,132 @@ + +1.1. Dienstleistung / Geltungsbereich +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Taler Operations AG (nachfolgend TOPS) mit Sitz in Biel/Bienne, Schweiz bietet +ein Bezahlsystem auf Basis von GNU Taler fuer Nutzer in der Schweiz an. +Nutzer sind Eigentümer von durch TOPS signierten und in CHF denominierten +Wertmarken (e-Geld) welche in Taler-Wallets in Eigenverantwortung gespeichert +werden und mit denen Nutzer bezahlen koennen. Dieses Dokument regelt die +Rechte und Pflichten von Nutzer und Zahlungsempfangern (Begünstigte). + +[CG: Please use TOPS instead of TALER AG everywhere] + +[CG: this sentence needs to go elsewhere, but I again did not get the full document +that I had asked for...] +Die Nutzer anerkennen sämtliche getätigten Zahlungen aus dem Taler-Wallet, selbst wenn diese ohne +ihre Zustimmung erfolgt sind. + +1.2. Zugang zu den TALER Zahldienstleistungen +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +GNU Taler ist ein System, das bargeldlose Zahlungen ermöglicht. GNU Taler +kann von Nutzern verwendet werden, um Zahlungen zwischen TOPS-Nutzern +durchzuführen und als Zahlungsmittel im stationären Handel, an Automaten, +online und in Apps bei autorisierten Händlern oder Dienstleistungsanbietern, +die TOPS signierte Wertmarken als Zahlungsmittel akzeptieren (nachfolgend +"**Begünstigte**"), eingesetzt zu werden. + + +1.4. Registrierung und Identifizierung +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + +1.4.1. Allgemeine Mitwirkungspflichten +-------------------------------------- + +Zur Nutzung des Zahlungsdiensts sind Nutzer und Begünstigte verpflichtet, TOPS bei +der Erfüllung regulatorischer und gesetzlicher Vorgaben zu unterstützen. Insbesondere kann +TOPS über die Identität von **wirtschaftlich Berechtigten** Auskunft verlangen. TOPS hat +das Recht und ggf. die gesetzliche Pflicht, Nutzer und Begünstigte von der Nutzung des +Zahlungsdiensts auszuschliessen, sollten diese die erforderlichen Auskünfte verweigern oder unwahre +Angaben machen. + +1.4.2. Pflichten Begünstigter +----------------------------- + +Zur Nutzung des Zahlungsdiensts gehen **Begünstigte** eine Geschäftsbeziehung mit +TOPS ein und können ggf. verpflichtet sein, sich bei TOPS zu registrieren und die dabei +verlangten Informationen zur Verfügung zu stellen. TOPS behält sich vor, zur Erfüllung +regulatorischer Vorgaben jederzeit weitere Informationen zu verlangen. + +1.4.3. Pflichten der Nutzer +--------------------------- + +Es erfolgt keine Kontenanlage der **Nutzer** bei TOPS. Erfasst werden jedoch +die IBAN-Konten von Nutzern die CHF an TOPS überweisen um Wertmarken zu +kaufen. Die Nutzer brauchen zum Empfang von Peer-to-Peer Zahlungen mindestens +eine Schweizer Mobiltelefonnummer zum Empfang von SMS zur Identifizierung. + + +1.10. Kommunikation +~~~~~~~~~~~~~~~~~~~ + +Die Kommunikation von TOPS zu Nutzern erfolgt grundsätzlich über +Benachrichtigungen im Taler-Protokoll. Die Nutzer sind dafür verantwortlich, +auf entsprechende Benachrichtigungen zu reagieren. TOPS hat das Recht, +Transaktionen solange nicht auszuführen, bis Nutzer auf diesem Weg +angeforderte rechtlich notwendige Daten bereitstellen. + + +1.12. Vorbehalt gesetzlicher Regelungen und Beschränkung der Dienstleistungen +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +1.12.1 Anpassungen an Gesetzesbestimmungen +------------------------------------------ + +Allfällige Gesetzesbestimmungen, die den Betrieb und die Nutzung von digitalen Endgeräten, +Zahlungsdiensten, des Internets und sonstiger Infrastruktur regeln, bleiben vorbehalten und gelten +ab ihrer Inkraftsetzung auch für die TOPS-Dienstleistungen. + +1.12.2 Selbstvorbehalt +----------------------- + +TOPS behält sich vor, das Angebot von Dienstleistungen jederzeit und ohne vorherige +Ankündigung zu ändern, zu beschränken oder vollständig einzustellen, insbesondere aufgrund +rechtlicher Anforderungen, technischen Problemen, zwecks Verhinderung von Missbräuchen, auf +behördliche Anordnung oder aus Sicherheitsgründen. + + +1.14 Datenschutz +~~~~~~~~~~~~~~~~ + +Weitere Informationen zu den Datenbearbeitungen finden sich in der Datenschutzerklärung auf +der Webseite der TOPS (www.taler-ops.ch). + + +1.15. Dauer und Kündigung +~~~~~~~~~~~~~~~~~~~~~~~~~ + +Die Geschäftsbeziehung zwischen TOPS und Begünstigten (Händler, Betriebe, +Verkäufer und sonstige Empfänger von Überweisungen des Zahlungsdiensts an die +begünstigten IBAN-Konten) wird auf eine unbestimmte Dauer abgeschlossen. TOPS +kann die Geschäftsbeziehung mit den Begünstigten jederzeit - insbesondere in +Missbrauchsfällen mit sofortiger Wirkung - kündigen. Eine schriftliche +Kündigung durch TOPS erfolgt an eine der zuletzt bekanntgegebenen Adressen der +Geschäftspartner (z.B. per E-Mail oder Brief). Sollten für über 12 Monate +keine Transaktionen an die Begünstigen erfolgen, gilt die Geschäftsbeziehung +als beendet. + +Die Nutzer von Taler-Wallets können das Guthaben in diesen jederzeit an die +Bankkonten zurücküberweisen lassen, von denen die Überweisung der Nutzer an +den Zahlungsdienst erfolgte, und so das Guthaben saldieren. Bei einer +Betriebsaufgabe des Zahlungsdiensts der TOPS werden die Nutzer über die +bevorstehende Einstellung des Zahlungsdiensts durch das Taler-Protokoll +informiert und von den Taler-Wallets aufgefordert, das bestehende Guthaben zu +saldieren. Nutzer, die diese Saldierung unterlassen, verlieren nach 3 Monaten +den Anspruch auf das danach noch bestehende Guthaben, welches in das Eigentum +der TOPS übergeht. + + +1.17. Anwendbares Recht und Gerichtsstand +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Soweit gesetzlich zulässig, unterstehen alle Rechtsbeziehungen zwischen den Kundinnen und +Kunden und TOPS (inkl. internationalen Zahlungen) ausschliesslich dem materiellen +schweizerischen Recht, unter Ausschluss von Kollisionsrecht und unter Ausschluss von +Staatsverträgen. + +Unter dem Vorbehalt von entgegenstehenden, zwingenden gesetzlichen Bestimmungen ist Biel +ausschliesslicher Gerichtsstand und Erfüllungsort. Für Kundinnen und Kunden mit Wohnsitz +ausserhalb der Schweiz ist Biel sodann auch Betreibungsort. + diff --git a/contrib/exchange-tos-v0.rst b/contrib/exchange-tos-v0.rst index ea3ab297d..1fdb66664 100644 --- a/contrib/exchange-tos-v0.rst +++ b/contrib/exchange-tos-v0.rst @@ -1,7 +1,7 @@ Terms of Service ================ -Last update: 22.2.2024 +Last update: 26.4.2024 ---------------------- Welcome! Taler Systems SA (“we,” “our,” or “us”) provides a payment service @@ -128,7 +128,7 @@ modified or unmodified form. However, the GPL is a strong copyleft license, which means that any derivative works must be distributed under the same license terms as the original software. If you have any questions, you should review the GNU GPL’s full terms and conditions on the GNU GPL Licenses page -(https://www.gnu.org/licenses/gpl-3.0.en.html/). “Taler” itself is a trademark +(https://www.gnu.org/licenses/). “Taler” itself is a trademark of Taler Systems SA. You are welcome to use the name in relation to processing payments based on the Taler protocol, assuming your use is compatible with an official release from the GNU Project that is not older than two years. @@ -150,10 +150,9 @@ damages, or claims arising from: 2) server failure or data loss; 3) unauthorized access to the Taler Wallet application; 4) bugs or other errors in the Taler Wallet software; and -5) any unauthorized third party activities, including, but not limited to, -the use of viruses, phishing, brute forcing, or other means of attack -against the Taler Wallet. We make no representations concerning any -Third Party Content contained in or accessed through our Services. +5) any unauthorized third party activities, including, but not limited to, the use of +viruses, phishing, brute forcing, or other means of attack against the Taler Wallet. We make no +representations concerning any Third Party Content contained in or accessed through our Services. Any other terms, conditions, warranties, or representations associated with such content, are solely between you and such organizations and/or individuals. @@ -165,16 +164,16 @@ acting, or purporting to act on our behalf (collectively the “Taler Parties” be liable to you under contract, tort, strict liability, negligence, or any other legal or equitable theory, for: -1) any lost profits, data loss, cost of procurement of substitute goods or services, -or direct, indirect, incidental, special, punitive, compensatory, -or consequential damages of any kind whatsoever resulting from: +1) any direct damages or +2) any lost profits, data loss, cost of procurement of substitute goods or services, or +direct, indirect, incidental, special, punitive, compensatory, or consequential damages of any kind +whatsoever resulting from: * your use of, or conduct in connection with, our services; * any unauthorized use of your wallet and/or private key due to your failure to maintain the confidentiality of your wallet; * any interruption or cessation of transmission to or from the services; or -* any bugs, viruses, trojan horses, or the like that are found in the Taler Wallet software or that may be transmitted to or through our services by any third party (regardless of the source of origination), or - -2) any direct damages. +* any bugs, viruses, trojan horses, or the like that are found in the Taler Wallet software +or that may be transmitted to or through our services by any third party (regardless of the source of origination). These limitations apply regardless of legal theory, whether based on tort, strict liability, breach of contract, breach of warranty, or any other legal diff --git a/contrib/gana b/contrib/gana -Subproject ffd02aa14f5c245b4d2454b2abef9ef43520a5b +Subproject 4728c9e60ce121f439b3db30cc08f06ff0beff7 diff --git a/contrib/locale/de/LC_MESSAGES/exchange-tos-v0.po b/contrib/locale/de/LC_MESSAGES/exchange-tos-v0.po index 6cd899442..1b0d296cf 100644 --- a/contrib/locale/de/LC_MESSAGES/exchange-tos-v0.po +++ b/contrib/locale/de/LC_MESSAGES/exchange-tos-v0.po @@ -190,7 +190,7 @@ msgid "" "copyleft license, which means that any derivative works must be distributed " "under the same license terms as the original software. If you have any " "questions, you should review the GNU GPL’s full terms and conditions at " -"https://www.gnu.org/licenses/gpl-3.0.en.html. “Taler” itself is a trademark " +"https://www.gnu.org/licenses/. “Taler” itself is a trademark " "of Taler Systems SA. You are welcome to use the name in relation to " "processing payments using the Taler protocol, assuming your use is " "compatible with an official release from the GNU Project that is not older " diff --git a/contrib/wallet-core b/contrib/wallet-core -Subproject da4ad41dcf4bd51df4330b5ce6cc4d0f4e10d3a +Subproject 64dea5e94086d8f79d1af7e5b7ee045d72d0249 |