Merge pull request #3830 from a-kraschitzer/third_party_licensing_cle…

…anup

[CM H2] Third party licensing cleanup

doc/THIRD-PARTY-LICENSES

@@ -7,40 +7,34 @@ Files: *
 Copyright: Elektra contributors (https://www.libelektra.org/developers/authors)
 License: BSD-3-clause
 
-Files: cmake/Modules/DownloadProject*
+Files: scripts/cmake/Modules/DownloadProject*
 Copyright: 2015 Craig Scott
 License: MIT
 
-Files: cmake/Modules/FindAugeas.cmake
-       cmake/Modules/FindDBus.cmake
-       cmake/Modules/FindGObjectIntrospection.cmake
-       cmake/Modules/FindSystemdJournal.cmake
+Files: scripts/cmake/Modules/FindAugeas.cmake
+       scripts/cmake/Modules/FindDBus.cmake
+       scripts/cmake/Modules/FindGObjectIntrospection.cmake
+       scripts/cmake/Modules/FindSystemdJournal.cmake
 Copyright: 2006 Alexander Neundorf <neundorf@kde.org>
            2008 Kevin Kofler <kevin.kofler@chello.at>
            2010 Pino Toscano <pino@kde.org>
            2013 Martin Briza <mbriza@redhat.com>
 License: BSD-3-clause-cmake
 
-Files: cmake/Modules/FindDiscount.cmake
+Files: scripts/cmake/Modules/FindDiscount.cmake
 Copyright: 2013-2013 Lars Baehren <lbaehren@gmail.com>
 License: BSD-2-clause-discount
 
-Files: cmake/Modules/FindLua52.cmake
-       cmake/Modules/FindPython2Interp.cmake
-       cmake/Modules/FindPython2Libs.cmake
-Copyright: 2001-2010 Kitware, Inc.
-           2011 Bjoern Ricks <bjoern.ricks@gmail.com>
-           2012 Rolf Eike Beer <eike@sf-mail.de>
+Files: scripts/cmake/Modules/FindLua.cmake
+       scripts/cmake/Modules/FindPython2Interp.cmake
+       scripts/cmake/Modules/FindPython2Libs.cmake
+Copyright: 2000-2021 Kitware, Inc. and Contributors
 License: BSD-3-clause-cmake-new
 
-Files: cmake/Modules/FindGLib.cmake
+Files: scripts/cmake/Modules/FindGLib.cmake
 Copyright: 2016 Evan Nemerson <evan@nemerson.com>
 License: MIT
 
-Files: src/plugins/ini/inih-r29/*
-Copyright: 2009, Brush Technology
-License: BSD-3-clause-inih
-
 Files: src/plugins/ni/nickel-1.1.0/*
 Copyright: 2008 Charles Lindsay <charles@chaoslizard.org>
 License: Zlib
@@ -54,44 +48,44 @@ License: public-domain
  You can use this free for any purpose.  It's in the public domain.
  It has no warranty.
 
-Files: src/tools/rest-frontend/resources/assets/skin/base/util/space.less
+Files: src/tools/website/resources/assets/skin/base/util/space.less
 Copyright: 2015 Ömer Aslanbakan
 License: MIT
 
-Files: src/tools/rest-frontend/public/assets/fonts/lato/*
+Files: src/tools/website/public/assets/fonts/lato/*
 Copyright: 2010-2014 by tyPoland Lukasz Dziedzic (team@latofonts.com) with Reserved Font Name "Lato"
 License: OFL-1.1
 
-Files: src/tools/rest-frontend/public/assets/fonts/libre-franklin/*
+Files: src/tools/website/public/assets/fonts/libre-franklin/*
 Copyright: 2015 Impallari Type (www.impallari.com)
 License: OFL-1.1
 
-Files: src/tools/rest-frontend/public/assets/fonts/font-awesome/*
+Files: src/tools/website/public/assets/fonts/font-awesome/*
 Copyright: 2016 Dave Gandy <dave@fontawesome.io>
 License: OFL-1.1
 
-Files: src/tools/rest-frontend/public/vendor/asciinema/asciinema-player.*
+Files: src/tools/website/public/vendor/asciinema/asciinema-player.*
 Copyright: 2011-2016 Marcin Kulik
 License: Apache-2.0
 
-Files: src/tools/rest-frontend/resources/assets/skin/base/fonts/font-awesome/*
+Files: src/tools/website/resources/assets/skin/base/fonts/font-awesome/*
 Copyright: 2016 Dave Gandy <dave@fontawesome.io>
 License: MIT
 
 Files: src/tools/qt-gui/src/markdownconverter/*
 Copyright: 2013 Christian Loose
 License: BSD-3-clause-markdownconverter
 
-Files: scripts/realpath
+Files: scripts/dev/realpath
 Copyright: 2014 Michael Kropat
 License: MIT
 
-Files: src/tools/web/client/public/Roboto-Light.ttf
-       src/tools/web/client/public/Roboto-Regular.ttf
+Files: src/tools/webui/public/Roboto-Light.ttf
+       src/tools/webui/public/Roboto-Regular.ttf
 Copyright: 2012 Google
 License: Apache-2.0
 
-Files: src/tools/kdb/gen/mustache.hpp: 
+Files: src/tools/kdb/gen/mustache.hpp
 Copyright: 2015-2018 Kevin Wojniak
 License: BSL-1.0
 

doc/news/_preparation_next_release.md

@@ -184,6 +184,7 @@ you up to date with the multi-language support provided by Elektra.
 - Improved documentation for module keytest in Elektra Core. _(@lawli3t)_
 - Improved documentation for module keyset in Elektra Core. _(@lawli3t)_
 - Fixed example in the "mount-configuration-files" tutorial [#3722](https://github.com/ElektraInitiative/libelektra/issues/3722). _(Philipp Oppel)_
+- Update and correct third party licensing information _(@a-kraschitzer)_
 
 ## Tests
 

scripts/check-third-party-license-file-paths

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+for i in $(grep -oP "(?<=Files: |\s{7})([^\*].*/.*)" ../doc/THIRD-PARTY-LICENSES); do
+	echo -n "../$i "
+	eval ls -d "../$i" 2> /dev/null | wc -l
+done

scripts/cmake/Modules/FindLua.cmake

@@ -37,18 +37,139 @@
 
 # ~~~
 # =============================================================================
-# Copyright 2007-2009 Kitware, Inc.
-# Copyright 2013 Rolf Eike Beer <eike@sf-mail.de>
+# CMake - Cross Platform Makefile Generator
+# Copyright 2000-2021 Kitware, Inc. and Contributors
+# All rights reserved.
 #
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
 #
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
+# * Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+#
+# * 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.
+#
+# * Neither the name of Kitware, Inc. nor the names of 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.
+#
+# ------------------------------------------------------------------------------
+#
+# The following individuals and institutions are among the Contributors:
+#
+# * Aaron C. Meadows <cmake@shadowguarddev.com>
+# * Adriaan de Groot <groot@kde.org>
+# * Aleksey Avdeev <solo@altlinux.ru>
+# * Alexander Neundorf <neundorf@kde.org>
+# * Alexander Smorkalov <alexander.smorkalov@itseez.com>
+# * Alexey Sokolov <sokolov@google.com>
+# * Alex Merry <alex.merry@kde.org>
+# * Alex Turbov <i.zaufi@gmail.com>
+# * Andreas Pakulat <apaku@gmx.de>
+# * Andreas Schneider <asn@cryptomilk.org>
+# * André Rigland Brodtkorb <Andre.Brodtkorb@ifi.uio.no>
+# * Axel Huebl, Helmholtz-Zentrum Dresden - Rossendorf
+# * Benjamin Eikel
+# * Bjoern Ricks <bjoern.ricks@gmail.com>
+# * Brad Hards <bradh@kde.org>
+# * Christopher Harvey
+# * Christoph Grüninger <foss@grueninger.de>
+# * Clement Creusot <creusot@cs.york.ac.uk>
+# * Daniel Blezek <blezek@gmail.com>
+# * Daniel Pfeifer <daniel@pfeifer-mail.de>
+# * Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
+# * Eran Ifrah <eran.ifrah@gmail.com>
+# * Esben Mose Hansen, Ange Optimization ApS
+# * Geoffrey Viola <geoffrey.viola@asirobots.com>
+# * Google Inc
+# * Gregor Jasny
+# * Helio Chissini de Castro <helio@kde.org>
+# * Ilya Lavrenov <ilya.lavrenov@itseez.com>
+# * Insight Software Consortium <insightsoftwareconsortium.org>
+# * Jan Woetzel
+# * Julien Schueller
+# * Kelly Thompson <kgt@lanl.gov>
+# * Konstantin Podsvirov <konstantin@podsvirov.pro>
+# * Laurent Montel <montel@kde.org>
+# * Mario Bensi <mbensi@ipsquad.net>
+# * Martin Gräßlin <mgraesslin@kde.org>
+# * Mathieu Malaterre <mathieu.malaterre@gmail.com>
+# * Matthaeus G. Chajdas
+# * Matthias Kretz <kretz@kde.org>
+# * Matthias Maennich <matthias@maennich.net>
+# * Michael Hirsch, Ph.D. <www.scivision.co>
+# * Michael Stürmer
+# * Miguel A. Figueroa-Villanueva
+# * Mike Jackson
+# * Mike McQuaid <mike@mikemcquaid.com>
+# * Nicolas Bock <nicolasbock@gmail.com>
+# * Nicolas Despres <nicolas.despres@gmail.com>
+# * Nikita Krupen'ko <krnekit@gmail.com>
+# * NVIDIA Corporation <www.nvidia.com>
+# * OpenGamma Ltd. <opengamma.com>
+# * Patrick Stotko <stotko@cs.uni-bonn.de>
+# * Per Øyvind Karlsen <peroyvind@mandriva.org>
+# * Peter Collingbourne <peter@pcc.me.uk>
+# * Petr Gotthard <gotthard@honeywell.com>
+# * Philip Lowman <philip@yhbt.com>
+# * Philippe Proulx <pproulx@efficios.com>
+# * Raffi Enficiaud, Max Planck Society
+# * Raumfeld <raumfeld.com>
+# * Roger Leigh <rleigh@codelibre.net>
+# * Rolf Eike Beer <eike@sf-mail.de>
+# * Roman Donchenko <roman.donchenko@itseez.com>
+# * Roman Kharitonov <roman.kharitonov@itseez.com>
+# * Ruslan Baratov
+# * Sebastian Holtermann <sebholt@xwmw.org>
+# * Stephen Kelly <steveire@gmail.com>
+# * Sylvain Joubert <joubert.sy@gmail.com>
+# * The Qt Company Ltd.
+# * Thomas Sondergaard <ts@medical-insight.com>
+# * Tobias Hunger <tobias.hunger@qt.io>
+# * Todd Gamblin <tgamblin@llnl.gov>
+# * Tristan Carel
+# * University of Dundee
+# * Vadim Zhukov
+# * Will Dicharry <wdicharry@stellarscience.com>
+#
+# See version control history for details of individual contributions.
+#
+# The above copyright and license notice applies to distributions of
+# CMake in source and binary form.  Third-party software packages supplied
+# with CMake under compatible licenses provide their own copyright notices
+# documented in corresponding subdirectories or source files.
+#
+# ------------------------------------------------------------------------------
+#
+# CMake was initially developed by Kitware with the following sponsorship:
+#
+#  * National Library of Medicine at the National Institutes of Health
+#    as part of the Insight Segmentation and Registration Toolkit (ITK).
+#
+#  * US National Labs (Los Alamos, Livermore, Sandia) ASC Parallel
+#    Visualization Initiative.
+#
+#  * National Alliance for Medical Image Computing (NAMIC) is funded by the
+#    National Institutes of Health through the NIH Roadmap for Medical Research,
+#    Grant U54 EB005149.
+#
+#  * Kitware, Inc.
 # =============================================================================
-# (To distribute this file outside of CMake, substitute the full
-#  License text for the above reference.)
 # ~~~
 
 unset (_lua_include_subdirs)