Linux-SPDX Archive on lore.kernel.org
 help / color / Atom feed
* [PATCH] LICENSES/deprecated: add Zlib license text
@ 2020-04-01 21:13 Mikhail Zaslonko
  2020-09-16  9:16 ` Lukas Bulwahn
  0 siblings, 1 reply; 2+ messages in thread
From: Mikhail Zaslonko @ 2020-04-01 21:13 UTC (permalink / raw)
  To: Thomas Gleixner, Greg Kroah-Hartman
  Cc: linux-spdx, linux-kernel, Lukas Bulwahn, Vasily Gorbik, Mikhail Zaslonko

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@gmail.com>
Signed-off-by: Mikhail Zaslonko <zaslonko@linux.ibm.com>
---
 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


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] LICENSES/deprecated: add Zlib license text
  2020-04-01 21:13 [PATCH] LICENSES/deprecated: add Zlib license text Mikhail Zaslonko
@ 2020-09-16  9:16 ` Lukas Bulwahn
  0 siblings, 0 replies; 2+ messages in thread
From: Lukas Bulwahn @ 2020-09-16  9:16 UTC (permalink / raw)
  To: Mikhail Zaslonko, Greg Kroah-Hartman
  Cc: Thomas Gleixner, linux-spdx, linux-kernel, Lukas Bulwahn, Vasily Gorbik


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@gmail.com>
> Signed-off-by: Mikhail Zaslonko <zaslonko@linux.ibm.com>
> ---

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

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

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
> 
> 

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, back to index

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-01 21:13 [PATCH] LICENSES/deprecated: add Zlib license text Mikhail Zaslonko
2020-09-16  9:16 ` Lukas Bulwahn

Linux-SPDX Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-spdx/0 linux-spdx/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-spdx linux-spdx/ https://lore.kernel.org/linux-spdx \
		linux-spdx@vger.kernel.org
	public-inbox-index linux-spdx

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-spdx


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git