summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <smcv@collabora.com>2022-05-18 14:09:59 +0100
committerRalf Habacker <ralf.habacker@freenet.de>2022-11-29 13:33:53 +0000
commitd6abc1da02959728236457e4a6b5b1b9a61b3427 (patch)
tree7699f4348850476e7d1e2b86f232a3c63b99134c
parent8c1d0f1391064c13abca702cdd89eecac0cd64a4 (diff)
downloaddbus-d6abc1da02959728236457e4a6b5b1b9a61b3427.tar.gz
cmake: Add BSD-style licenses
I've erred on the side of caution and treated the COPYING-CMAKE-SCRIPTS license (a BSD-3-Clause variation) as its own distinct license. Co-authored-by: Ralf Habacker <ralf.habacker@freenet.de> Signed-off-by: Simon McVittie <smcv@collabora.com>
-rw-r--r--LICENSES/BSD-3-Clause.txt11
-rw-r--r--LICENSES/LicenseRef-CMakeScripts.txt (renamed from cmake/modules/COPYING-CMAKE-SCRIPTS)3
-rw-r--r--Makefile.am2
-rw-r--r--cmake/modules/FindDocBookXSL.cmake1
-rw-r--r--cmake/modules/FindGLIB2.cmake3
-rw-r--r--cmake/modules/Win32Macros.cmake1
6 files changed, 20 insertions, 1 deletions
diff --git a/LICENSES/BSD-3-Clause.txt b/LICENSES/BSD-3-Clause.txt
new file mode 100644
index 00000000..ea890afb
--- /dev/null
+++ b/LICENSES/BSD-3-Clause.txt
@@ -0,0 +1,11 @@
+Copyright (c) <year> <owner>.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/cmake/modules/COPYING-CMAKE-SCRIPTS b/LICENSES/LicenseRef-CMakeScripts.txt
index 53b6b71e..d039066d 100644
--- a/cmake/modules/COPYING-CMAKE-SCRIPTS
+++ b/LICENSES/LicenseRef-CMakeScripts.txt
@@ -20,3 +20,6 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+(This is a variation of the BSD-3-Clause license, with slightly different
+wording.)
diff --git a/Makefile.am b/Makefile.am
index 49d8d4a8..f905fc7e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,7 +15,9 @@ EXTRA_DIST = \
LICENSES/AFL-2.0.txt \
LICENSES/AFL-2.1.txt \
LICENSES/Apache-2.0.txt \
+ LICENSES/BSD-3-Clause.txt \
LICENSES/GPL-2.0-or-later.txt \
+ LICENSES/LicenseRef-CMakeScripts.txt \
LICENSES/LicenseRef-GAP.txt \
LICENSES/LicenseRef-pycrypto-orig.txt \
LICENSES/MIT.txt \
diff --git a/cmake/modules/FindDocBookXSL.cmake b/cmake/modules/FindDocBookXSL.cmake
index 3d9e40c4..edb10c4e 100644
--- a/cmake/modules/FindDocBookXSL.cmake
+++ b/cmake/modules/FindDocBookXSL.cmake
@@ -6,6 +6,7 @@
# used to process DocBook XML
# Copyright (c) 2010, Luigi Toscano, <luigi.toscano@tiscali.it>
+# SPDX-License-Identifier: BSD-3-Clause
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
diff --git a/cmake/modules/FindGLIB2.cmake b/cmake/modules/FindGLIB2.cmake
index 0cadba5e..97d2bf21 100644
--- a/cmake/modules/FindGLIB2.cmake
+++ b/cmake/modules/FindGLIB2.cmake
@@ -7,9 +7,10 @@
# Copyright (c) 2008 Laurent Montel, <montel@kde.org>
# Copyright (c) 2013 Ralf Habacker, <ralf.habacker@freenet.de>
+# SPDX-License-Identifier: LicenseRef-CMakeScripts.txt
#
# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+# For details see LICENSES/LicenseRef-CMakeScripts.txt.
if(GLIB2_INCLUDE_DIR AND GLIB2_LIBRARIES)
diff --git a/cmake/modules/Win32Macros.cmake b/cmake/modules/Win32Macros.cmake
index c5054c67..4df8df51 100644
--- a/cmake/modules/Win32Macros.cmake
+++ b/cmake/modules/Win32Macros.cmake
@@ -2,6 +2,7 @@
# win32 macros
#
# Copyright (c) 2006-2007, Ralf Habacker
+# SPDX-License-Identifier: BSD-3-Clause
#
# Redistribution and use is allowed according to the terms of the BSD license.
#