summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <smcv@collabora.com>2022-05-18 14:29:11 +0100
committerRalf Habacker <ralf.habacker@freenet.de>2022-11-29 13:33:53 +0000
commiteae69d2c1afacebe6deff65b3720c25815eeb305 (patch)
treee9d8f495ff7107fbe8a48342349735e8c2ab5841
parentd0d4d4d3d33ece5e1e86222c04a4b83b9e746495 (diff)
downloaddbus-eae69d2c1afacebe6deff65b3720c25815eeb305.tar.gz
dbus-hash: Add (AFL-2.1 OR GPL-2.0-or-later) AND TCL SPDX license identifier
The TCL-derived code is under its own license, so the overall license of the file is (AFL-2.1 OR GPL-2.0-or-later) AND TCL. Signed-off-by: Simon McVittie <smcv@collabora.com>
-rw-r--r--LICENSES/TCL.txt9
-rw-r--r--Makefile.am1
-rw-r--r--dbus/dbus-hash.c1
-rw-r--r--test/internals/hash.c1
4 files changed, 12 insertions, 0 deletions
diff --git a/LICENSES/TCL.txt b/LICENSES/TCL.txt
new file mode 100644
index 00000000..4b9cdb48
--- /dev/null
+++ b/LICENSES/TCL.txt
@@ -0,0 +1,9 @@
+This software is copyrighted by the Regents of the University of California, Sun Microsystems, Inc., Scriptics Corporation, ActiveState Corporation and other parties. The following terms apply to all files associated with the software unless explicitly disclaimed in individual files.
+
+The authors hereby grant permission to use, copy, modify, distribute, and license this software and its documentation for any purpose, provided that existing copyright notices are retained in all copies and that this notice is included verbatim in any distributions. No written agreement, license, or royalty fee is required for any of the authorized uses. Modifications to this software may be copyrighted by their authors and need not follow the licensing terms described here, provided that the new terms are clearly indicated on the first page of each file where they apply.
+
+IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT. THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+
+GOVERNMENT USE: If you are acquiring this software on behalf of the U.S. government, the Government shall have only "Restricted Rights" in the software and related documentation as defined in the Federal Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2). If you are acquiring the software on behalf of the Department of Defense, the software shall be classified as "Commercial Computer Software" and the Government shall have only "Restricted Rights" as defined in Clause 252.227-7013 (c) (1) of DFARs. Notwithstanding the foregoing, the authors grant the U.S. Government and others acting in its behalf permission to use and distribute the software in accordance with the terms specified in this license.
diff --git a/Makefile.am b/Makefile.am
index 2a6778d1..e08671b5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,6 +18,7 @@ EXTRA_DIST = \
LICENSES/LicenseRef-GAP.txt \
LICENSES/LicenseRef-pycrypto-orig.txt \
LICENSES/MIT.txt \
+ LICENSES/TCL.txt \
NEWS.pre-1-0 \
NEWS.pre-1-2 \
README.cmake \
diff --git a/dbus/dbus-hash.c b/dbus/dbus-hash.c
index f04b0d11..2635a154 100644
--- a/dbus/dbus-hash.c
+++ b/dbus/dbus-hash.c
@@ -9,6 +9,7 @@
* Copyright 2010 Fridrich Štrba
* Copyright 2016 Ralf Habacker
* Copyright 2017 Endless Mobile, Inc.
+ * SPDX-License-Identifier: (AFL-2.1 OR GPL-2.0-or-later) AND TCL
*
* Hash table implementation based on generic/tclHash.c from the Tcl
* source code. The original Tcl license applies to portions of the
diff --git a/test/internals/hash.c b/test/internals/hash.c
index 192d82e3..ae4d829c 100644
--- a/test/internals/hash.c
+++ b/test/internals/hash.c
@@ -5,6 +5,7 @@
* Copyright 2002-2009 Red Hat, Inc.
* Copyright 2003 Joe Shaw
* Copyright 2011-2018 Collabora Ltd.
+ * SPDX-License-Identifier: (AFL-2.1 OR GPL-2.0-or-later) AND TCL
*
* Licensed under the Academic Free License version 2.1
*