From c4f8bb86a914a5269d2053e614f319bdc5b66522 Mon Sep 17 00:00:00 2001 From: Michael Wedl Date: Wed, 10 Apr 2024 09:33:09 +0200 Subject: [PATCH] Update license notice file --- CHANGELOG.md | 2 +- api/NOTICE | 56 +++++++++++++++++++++--------------------- api/generate_notice.sh | 28 ++++++++++++++++++++- 3 files changed, 56 insertions(+), 30 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c0bdbe0b0..4fddf0a07 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## v2024.027 - 2024-04-10 +## v2024.028 - 2024-04-10 * Collaborative editing in notes * Show cursor position and selection of other users for collaborative editing in notes * Remember "Encrypt PDF" setting in browser's local storage diff --git a/api/NOTICE b/api/NOTICE index d97e65cc1..a71c3093b 100644 --- a/api/NOTICE +++ b/api/NOTICE @@ -3465,11 +3465,11 @@ Historical Permission Notice and Disclaimer (HPND) The Python Imaging Library (PIL) is Copyright © 1997-2011 by Secret Labs AB - Copyright © 1995-2011 by Fredrik Lundh + Copyright © 1995-2011 by Fredrik Lundh and contributors Pillow is the friendly PIL fork. It is - Copyright © 2010-2024 by Jeffrey A. Clark (Alex) and contributors. + Copyright © 2010-2024 by Jeffrey A. Clark and contributors Like PIL, Pillow is licensed under the open source HPND License: @@ -5694,7 +5694,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -pyasn1-modules +pyasn1_modules BSD License Copyright (c) 2005-2020, Ilya Etingof All rights reserved. @@ -5726,7 +5726,7 @@ pycparser BSD License pycparser -- A C parser in Python -Copyright (c) 2008-2020, Eli Bendersky +Copyright (c) 2008-2022, Eli Bendersky All rights reserved. Redistribution and use in source and binary forms, with or without modification, @@ -5737,7 +5737,7 @@ are permitted provided that the following conditions are met: * 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 Eli Bendersky nor the names of its contributors may +* 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. @@ -6404,29 +6404,6 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -pytz -MIT License -Copyright (c) 2003-2019 Stuart Bishop - -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and associated documentation files (the "Software"), -to deal in the Software without restriction, including without limitation -the rights to use, copy, modify, merge, publish, distribute, sublicense, -and/or sell copies of the Software, and to permit persons to whom the -Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -DEALINGS IN THE SOFTWARE. - - qrcode BSD License Copyright (c) 2011, Lincoln Loop @@ -9212,3 +9189,26 @@ or special or punitive damages (including but not limited to loss of income, program interruption, loss of information, or other pecuniary loss) arising out of use of this information, no matter the cause of action, even if The MITRE Corporation has been advised of the possibility of such damages. + +randomcolor +MIT License + +Copyright (c) 2016 Kevin Wu + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/api/generate_notice.sh b/api/generate_notice.sh index cd33747bd..f6188350b 100755 --- a/api/generate_notice.sh +++ b/api/generate_notice.sh @@ -21,9 +21,10 @@ ignore="webencodings" ignore="$ignore pyphen" ignore="$ignore freetype2" ignore="$ignore cwe" +ignore="$ignore randomcolor" pip3 install pip-licenses -pip-licenses --allow-only "$allow_only" >/dev/null +pip-licenses --allow-only "$allow_only" --ignore-packages $ignore >/dev/null pip-licenses -l --no-license-path -f plain-vertical --no-version --ignore-packages $ignore > NOTICE @@ -753,6 +754,31 @@ even if The MITRE Corporation has been advised of the possibility of such damage EOF ) +randomcolor=$(cat << EOF +MIT License + +Copyright (c) 2016 Kevin Wu + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +EOF +) + for pkg in $ignore do echo "" >> NOTICE # Add newline