[taler-docs] 03/03: update parts of the outdated information on licensing

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository docs.

commit 98e26cfe2331322ce9f45878729ea471d11360cf
Author: Christian Grothoff <grothoff@gnunet.org>
AuthorDate: Sat Mar 11 06:12:43 2023 +0100

    update parts of the outdated information on licensing
---
 global-licensing.rst | 111 +++++++++++++++++++++++++++------------------------
 index.rst            |   2 +-
 2 files changed, 60 insertions(+), 53 deletions(-)

diff --git a/global-licensing.rst b/global-licensing.rst
index ac5f748..4c9efaa 100644
--- a/global-licensing.rst
+++ b/global-licensing.rst
@@ -15,15 +15,30 @@ to integrate with Taler to be under LGPL, standalone 
binaries and
 testcases to be under GPL, and Web servers implementing Web services
 to be under AGPL.
 
-+++++++++++++++++++++++++
-API (git://taler.net/api)
-+++++++++++++++++++++++++
-
-The specification has been jointly developed by INRIA and by individuals
+The project was initially started based on code and documentation from GNUnet
+e.V. and INRIA, and is continued to be developed by the GNUnet community and
+Taler Systems SA.  INRIA and GNUnet e.V. have both assigned or shared their
+copyrights with Taler Systems SA.  Thus, it should generally be said that the
+code is copyright Taler Systems SA.
+
+We are also working closely with the GNU Anastasis package. Here, the same
+copyright sharing is in place between the original developers from BFH and
+GNUnet e.V., except that the copyright was assigned or shared with Anastasis
+SARL. Agreements are in place that allows developers to freely move code
+between GNU Anastasis, GNUnet and GNU Taler if this is technically warranted
+(note that all developers must sign the GNUnet e.V. copyright contributor
+agreement).
+
+
+++++++++++++++++++++++++++++++
+API (git://git.taler.net/docs)
+++++++++++++++++++++++++++++++
+
+The specification has been originally developed by INRIA and by individuals
 being under the juridical subject called 'GNUnet e.V.'. For each source
 file, the header indicated whose is holding the copyright, since some
 parts have been taken "verbatim" from the GNUnet e.V. foundation, and
-some other have been developed at INRIA "ex novo".
+some other have been developed at INRIA or Taler Systems SA "ex novo".
 
 Generally, GNU GPLv3 license is used for them; see COPYING.GPL.
 
@@ -63,7 +78,7 @@ project, and gives the copyright holder for each of them:
 WebExtensions Wallet (git://taler.net/wallet-webex)
 +++++++++++++++++++++++++++++++++++++++++++++++++++
 
-The TypeScript code was developed 100% at INRIA, but the project
+The TypeScript code was originally developed at INRIA, but the project
 involves compiling libgnunetutil and libtalerutil to JavaScript, and
 thus depends on software from GNUnet e.V.
 
@@ -86,13 +101,13 @@ Note that these dependencies are compiled into the 
extension and do
 not appear as separate binary files.
 
 
-+++++++++++++++++++++++++++++++++++
-Merchant (git://taler.net/merchant)
-+++++++++++++++++++++++++++++++++++
++++++++++++++++++++++++++++++++++++++++
+Merchant (git://git.taler.net/merchant)
++++++++++++++++++++++++++++++++++++++++
 
 This project contains code under two different licenses, and whose
 copyright is held by INRIA and/or GNUnet e.V..  Please refer to each
-source file to know which party holds the copyright.
+source file to know which party holds the original copyright.
 
 Source files are located in the following directories:
 
@@ -105,25 +120,21 @@ Source files are located in the following directories:
 * examples/shop/
 * copylib/
 
-In examples/blog/articles/ we included a book by Richard Stallman.
-It comes with its own permissive license (see COPYING in the
-directory).
+The merchant's backend (i.e. all the code in src/backend/) is under the GNU
+Affero GPL.  Note that the use of the Affero GPL has little impact as the
+backend is not supposed to be directly accessible to the Internet).  The
+license for this code is in COPYING.GPL and COPYING.AGPL.
 
+The merchant's frontend logic (i.e. JavaScript interacting with
+the wallet, sample code for a shop) is under the GNU GPL.
 
-The merchant's backend (i.e. all the code in src/backend/) is under
-the GNU Affero GPL as it depends on libgnunetutil.  Note that the use
-of the Affero GPL has little impact as the backend is not supposed to
-be directly accessible to the Internet).  The license for this code is
-in COPYING.GPL and COPYING.AGPL.
+The merchant library (src/lib/) is under the Lesser GNU GPL as it can be
+linked with more diverse licensed software.  The license text for this code is
+in COPYING.LGPL.
 
-The merchant's frontend logic (i.e. JavaScript interacting with
-the wallet, sample code for a shop) is under the GNU LGPL (but
-we may choose to change this to be in the public domain or
-BSD-licensed if necessary; the code is so short that there is
-anyway the question whether it is copyrightable).  Under this same
-license, it comes the merchant library (src/lib/) as it can be linked
-with more diverse licensed software.  The license text for this code
-is in COPYING.LGPL.
+In taler-merchant-demos.git/talermerchantdemos/blog/articles/ we included a 
book
+by Richard Stallman.  It comes with its own permissive license (see COPYING in
+the directory).
 
 
 
@@ -140,26 +151,18 @@ project, and gives the copyright holder for each of them:
 * libgnunetutil (in all of its variants): GPLv3+, owned by GNUnet e.V.
 * PHP:  PHP License, AGPL- and LGPL-Compatible, owned by The PHP Group
 
-+++++++++++++++++++++++++++
-Bank (git://taler.net/bank)
-+++++++++++++++++++++++++++
++++++++++++++++++++++++++++++++++++++++
+Libeufin (git://git.taler.net/libeufin)
++++++++++++++++++++++++++++++++++++++++
 
 ---------
 Licensing
 ---------
 
-This project has been developed by INRIA.  For each source file, the
-header indicated whose is holding the copyright.  The licensing plan
-for the bank is to use the Affero GPLv3+.
-
-Source files of interest are located in the following directories:
-(The repository holds also scaffolded files autogenerated by Django,
-which do not have legal significance in this context.)
-
-* TalerBank/Bank/
-* TalerBank/Bank/templates/
-* TalerBank/my-static/
-* website/
+This project has been developed by Stanisci and Dold who are
+sharing their copyright with Taler Systems SA.  For each source file, the
+header indicated whose is holding the copyright.  The license is
+the Affero GPLv3+.
 
 --------------------
 Runtime dependencies
@@ -178,13 +181,14 @@ project, and gives the copyright holder for each of them:
 
 .. _exchange-repo:
 
-+++++++++++++++++++++++++++++++++++
-Exchange (git://taler.net/exchange)
-+++++++++++++++++++++++++++++++++++
++++++++++++++++++++++++++++++++++++++++
+Exchange (git://git.taler.net/exchange)
++++++++++++++++++++++++++++++++++++++++
 
-This component is based on code initially developed in Munich for
-GNUnet e.V.  Most recent improvements and maintenance has been done at
-Inria.  The copyright is thus shared between both institutions.
+This component is based on code initially developed in Munich for GNUnet
+e.V. but was significantly rewritten by INRIA. Most recent improvements and
+maintenance has been done at Taler Systems SA and BFH (under a copyright
+sharing agreement with GNUnet e.V.).  The copyright is with Taler Systems SA.
 
 The licensing for exported libraries to access the exchange is LGPL,
 the exchange itself is under AGPL, and testcases and standalone
@@ -200,14 +204,17 @@ project, and gives the copyright holder for each of them:
 
 * libjansson: MIT License, AGPL- and LGPL-Compatible, owned by Petri Lehtinen 
and other individuals
 * libgcrypt: LGPL, owned by Free Software Foundation
+* libsodium: LGPL
 * postgresql: PostgreSQL License, AGPL- and LGPL-Compatible, owned by The 
PostgreSQL Global Development Group
 * libgnunetutil (in all of its variants): GPLv3+, owned by GNUnet e.V.
-* libgnunetjson: GPLv3+, GNUnet e.V.
+* libgnunetjson: LGPLv3+, GNUnet e.V.
+* libgnunetpq: AGPLv3+, GNUnet e.V.
+* libgnunetcurl: LGPLv3+, GNUnet e.V.
 
 
-+++++++++++++++++++++++++++++++++++++++++
-Web includes (git://taler.net/web-common)
-+++++++++++++++++++++++++++++++++++++++++
++++++++++++++++++++++++++++++++++++++++++++++
+Web includes (git://git.taler.net/web-common)
++++++++++++++++++++++++++++++++++++++++++++++
 
 All copyright owned by INRIA (but questionable whether creativity
 threshold for copyright is even met).
diff --git a/index.rst b/index.rst
index 25d51f8..aa49c4c 100644
--- a/index.rst
+++ b/index.rst
@@ -1,6 +1,6 @@
 ..
   This file is part of GNU TALER.
-  Copyright (C) 2014-2021 Taler Systems SA
+  Copyright (C) 2014-2023 Taler Systems SA
 
   TALER is free software; you can redistribute it and/or modify it under the
   terms of the GNU Affero General Public License as published by the Free 
Software

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.