Re: [PATCH] LICENSES/deprecated: add Zlib license text

From: Lukas Bulwahn
Date: Wed Sep 16 2020 - 05:17:21 EST



On Wed, 1 Apr 2020, Mikhail Zaslonko wrote:

> The new files contributed to zlib have Zlib SPDX license identifier. Since
> there was no Zlib license text in LICENSES, scripts/spdxcheck.py
> reported the following errors:
> lib/zlib_dfltcc/dfltcc.c: 1:28 Invalid License ID: Zlib
> lib/zlib_dfltcc/dfltcc.h: 1:28 Invalid License ID: Zlib
> lib/zlib_dfltcc/dfltcc_deflate.c: 1:28 Invalid License ID: Zlib
> lib/zlib_dfltcc/dfltcc_inflate.c: 1:28 Invalid License ID: Zlib
> lib/zlib_dfltcc/dfltcc_util.h: 1:28 Invalid License ID: Zlib
>
> The patch adds Zlib SPDX license to LICENSES/deprecated, thus
> resolving the issues reported by spdxcheck.
>
> Suggested-by: Lukas Bulwahn <lukas.bulwahn@xxxxxxxxx>
> Signed-off-by: Mikhail Zaslonko <zaslonko@xxxxxxxxxxxxx>
> ---

IANAL, but to me that looks identical to the reference text on spdx.org.
So:

Reviewed-by: Lukas Bulwahn <lukas.bulwahn@xxxxxxxxx>

Greg, could you pick this patch on your spdx tree?

It has been hanging around here quite long :)

Lukas

> LICENSES/deprecated/Zlib | 27 +++++++++++++++++++++++++++
> 1 file changed, 27 insertions(+)
> create mode 100644 LICENSES/deprecated/Zlib
>
> diff --git a/LICENSES/deprecated/Zlib b/LICENSES/deprecated/Zlib
> new file mode 100644
> index 000000000000..b60d0d73f131
> --- /dev/null
> +++ b/LICENSES/deprecated/Zlib
> @@ -0,0 +1,27 @@
> +Valid-License-Identifier: Zlib
> +SPDX-URL: https://spdx.org/licenses/Zlib.html
> +Usage-Guide:
> + To use the Zlib License put the following SPDX tag/value pair into a
> + comment according to the placement guidelines in the licensing rules
> + documentation:
> + SPDX-License-Identifier: Zlib
> +License-Text:
> +
> +zlib License
> +
> +Copyright (c) <year> <copyright holders>
> +
> +This software is provided 'as-is', without any express or implied warranty. In
> +no event will the authors be held liable for any damages arising from the use
> +of this software.
> +
> +Permission is granted to anyone to use this software for any purpose, including
> +commercial applications, and to alter it and redistribute it freely, subject
> +to the following restrictions:
> + 1. The origin of this software must not be misrepresented; you must not
> +claim that you wrote the original software. If you use this software in a
> +product, an acknowledgment in the product documentation would be appreciated
> +but is not required.
> + 2. Altered source versions must be plainly marked as such, and must not be
> +misrepresented as being the original software.
> + 3. This notice may not be removed or altered from any source distribution.
> --
> 2.17.1
>
>