Properly describe upstream license, and file changes

diff --git a/COPYING b/COPYING
new file mode 100644 (file)
index 0000000..5fcbc4b
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,38 @@
+Aside from files taken from Drupal, the files in this repository are patched or
+copied files based on the upstream SimpleSAMLphp tarball release, versions
+1.18.7 and later.
+
+Within `extlib/`, the two files from Drupal 7 (bootstrap.inc and password.inc)
+are licensed GPL-2.0-or-later. See <https://www.drupal.org/about/licensing>
+
+Images are under their own respective licenses.
+
+Modifications to upstream SSP code are licensed under LGPL-2.1-or-later:
+
+Copyright 2020-2022 Andrew Engelbrecht
+
+---
+Original upstream copyright notice:
+---
+
+Copyright 2007-2021 UNINETT AS, https://www.uninett.no
+
+SimpleSAMLphp is licensed under the CC-GNU LGPL version 2.1.
+http://creativecommons.org/licenses/LGPL/2.1/
+
+Note that some of the embedded libraries may be using other licenses.
+For example xmlseclibs uses BSD license.
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

diff --git a/docs/fsf-drupal-auth.md b/docs/fsf-drupal-auth.md
index b909473ce4605bf6bb990ade1b599b4ba40a13ee..4ebbd028726811cdb88493559c82789c72f30db6 100644 (file)
--- a/docs/fsf-drupal-auth.md
+++ b/docs/fsf-drupal-auth.md
@@ -22,14 +22,7 @@ SQL queries in `config/authsources.php` should be something like the following:
 
 ## License
 
-Outside of `extlib/`, this module, and the `sqlauth` module (as distributed via
-the SSP bundled tarball), which fsfdrupalauth is based on, are licensed under
-LGPL-2.1-or-later.
-
-Within `extlib/`, the two files from Drupal 7 (bootstrap.inc and password.inc)
-are licensed GPL-2.0-or-later. See <https://www.drupal.org/about/licensing>
-
-Images are under their own respective licenses.
+See COPYING file.
 
 ---
 

diff --git a/themes/fsftheme/casserver/loggedIn.php b/themes/fsftheme/casserver/loggedIn.php
index 3f33e71b38b58841f99a61a107ce255779f9dfa8..5cf48d0fcc06df55e124f0f9cc7c592cdfecd8cd 100644 (file)
--- a/themes/fsftheme/casserver/loggedIn.php
+++ b/themes/fsftheme/casserver/loggedIn.php
@@ -3,6 +3,7 @@
 *    simpleSAMLphp-casserver is a CAS 1.0 and 2.0 compliant CAS server in the form of a simpleSAMLphp module
 *
 *    Copyright (C) 2013  Bjorn R. Jensen
+*    Copyright (C) 2020-2022  Andrew Engelbrecht
 *
 *    This library is free software; you can redistribute it and/or
 *    modify it under the terms of the GNU Lesser General Public