[PATCH 0/2] Map license names PSF and PSFv2 to PSF-2.0

[PATCH 0/2] Map license names PSF and PSFv2 to PSF-2.0

[toertel]

According to SDPX.org "Python License 2.0" is the overall Python
license, which is comprised of several licenses. "Python Software
Foundation License 2.0" is part of the complete Python license, but is
also used independently by some projects.

So far the license names PSF and PSFv2 found in LICENSE are mapped to
to Python-2.0. This patch maps PSF and PSFv2 to PSF-2.0 und thus
corrects the impression that Python-2.0 and PSF-2.0 are synonymous.

Mark Jonas (2):
  Add license text for PSF-2.0
  Map license names PSF and PSFv2 to PSF-2.0

 meta/conf/licenses.conf            |  6 ++--
 meta/files/common-licenses/PSF-2.0 | 49 ++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 2 deletions(-)
 create mode 100644 meta/files/common-licenses/PSF-2.0

--
2.25.1

[PATCH 1/2] Add license text for PSF-2.0

[Mark Jonas]

Signed-off-by: Mark Jonas <toertel@gmail.com>
---
 meta/files/common-licenses/PSF-2.0 | 49 ++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 meta/files/common-licenses/PSF-2.0

diff --git a/meta/files/common-licenses/PSF-2.0 b/meta/files/common-licenses/PSF-2.0
new file mode 100644
index 0000000000..4e673e93fc
--- /dev/null
+++ b/meta/files/common-licenses/PSF-2.0
@@ -0,0 +1,49 @@
+
+PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
+--------------------------------------------
+
+1. This LICENSE AGREEMENT is between the Python Software Foundation
+("PSF"), and the Individual or Organization ("Licensee") accessing and
+otherwise using this software ("Python") in source or binary form and
+its associated documentation.
+
+2. Subject to the terms and conditions of this License Agreement, PSF
+hereby grants Licensee a nonexclusive, royalty-free, world-wide
+license to reproduce, analyze, test, perform and/or display publicly,
+prepare derivative works, distribute, and otherwise use Python
+alone or in any derivative version, provided, however, that PSF's
+License Agreement and PSF's notice of copyright, i.e., "Copyright (c)
+2001, 2002, 2003, 2004, 2005, 2006 Python Software Foundation; All Rights
+Reserved" are retained in Python alone or in any derivative version
+prepared by Licensee.
+
+3. In the event Licensee prepares a derivative work that is based on
+or incorporates Python or any part thereof, and wants to make
+the derivative work available to others as provided herein, then
+Licensee hereby agrees to include in any such work a brief summary of
+the changes made to Python.
+
+4. PSF is making Python available to Licensee on an "AS IS"
+basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
+DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT
+INFRINGE ANY THIRD PARTY RIGHTS.
+
+5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
+FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
+A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON,
+OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
+
+6. This License Agreement will automatically terminate upon a material
+breach of its terms and conditions.
+
+7. Nothing in this License Agreement shall be deemed to create any
+relationship of agency, partnership, or joint venture between PSF and
+Licensee. This License Agreement does not grant permission to use PSF
+trademarks or trade name in a trademark sense to endorse or promote
+products or services of Licensee, or any third party.
+
+8. By copying, installing or otherwise using Python, Licensee
+agrees to be bound by the terms and conditions of this License
+Agreement.
-- 
2.25.1

[PATCH 2/2] Map license names PSF and PSFv2 to PSF-2.0

[Mark Jonas]

According to SDPX.org "Python License 2.0" is the overall Python
license, which is comprised of several licenses. "Python Software
Foundation License 2.0" is part of the complete Python license, but is
also used independently by some projects.

So far the license names PSF and PSFv2 found in LICENSE are mapped to
to Python-2.0. This patch maps PSF and PSFv2 to PSF-2.0 und thus
corrects the impression that Python-2.0 and PSF-2.0 are synonymous.

Signed-off-by: Mark Jonas <toertel@gmail.com>
---
 meta/conf/licenses.conf | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta/conf/licenses.conf b/meta/conf/licenses.conf
index 751424d1b6..5b309eb385 100644
--- a/meta/conf/licenses.conf
+++ b/meta/conf/licenses.conf
@@ -45,9 +45,11 @@ SPDXLICENSEMAP[MIT-style] = "MIT"
 #Openssl variations
 SPDXLICENSEMAP[openssl] = "OpenSSL"
 
+#PSF variations
+SPDXLICENSEMAP[PSF] = "PSF-2.0"
+SPDXLICENSEMAP[PSFv2] = "PSF-2.0"
+
 #Python variations
-SPDXLICENSEMAP[PSF] = "Python-2.0"
-SPDXLICENSEMAP[PSFv2] = "Python-2.0"
 SPDXLICENSEMAP[Python-2] = "Python-2.0"
 
 #Apache variations
-- 
2.25.1

Re: [PATCH 0/2] Map license names PSF and PSFv2 to PSF-2.0

[Mark Jonas]

Hi,

Gentle ping about my patch. I am rather confident that I posted on the
right mailing list.

Thanks,
Mark

On Sat, Sep 19, 2020 at 3:20 PM Mark Jonas <toertel@gmail.com> wrote:
>
> According to SDPX.org "Python License 2.0" is the overall Python
> license, which is comprised of several licenses. "Python Software
> Foundation License 2.0" is part of the complete Python license, but is
> also used independently by some projects.
>
> So far the license names PSF and PSFv2 found in LICENSE are mapped to
> to Python-2.0. This patch maps PSF and PSFv2 to PSF-2.0 und thus
> corrects the impression that Python-2.0 and PSF-2.0 are synonymous.
>
> Mark Jonas (2):
>   Add license text for PSF-2.0
>   Map license names PSF and PSFv2 to PSF-2.0
>
>  meta/conf/licenses.conf            |  6 ++--
>  meta/files/common-licenses/PSF-2.0 | 49 ++++++++++++++++++++++++++++++
>  2 files changed, 53 insertions(+), 2 deletions(-)
>  create mode 100644 meta/files/common-licenses/PSF-2.0
>
> --
> 2.25.1

Re: [PATCH 0/2] Map license names PSF and PSFv2 to PSF-2.0

[Richard Purdie]

On Mon, 2020-09-28 at 19:49 +0200, Mark Jonas wrote:
> Hi,
> 
> Gentle ping about my patch. I am rather confident that I posted on
> the
> right mailing list.

I'm afraid its not the right list, these would go to openembedded-core.

I did look at these and they do look like good changes to have, the
incorrect list meant I lost track though.

Cheers,

Richard

Re: [PATCH 0/2] Map license names PSF and PSFv2 to PSF-2.0

[Mark Jonas]

Hi Richard,

> I'm afraid its not the right list, these would go to openembedded-core.

Thanks for the hint. I re-posted my patch on openembedded-core.

Greetings,
Mark

[PATCH 0/2] Map license names PSF and PSFv2 to PSF-2.0

[Mark Jonas]

According to SDPX.org "Python License 2.0" is the overall Python
license, which is comprised of several licenses. "Python Software
Foundation License 2.0" is part of the complete Python license, but is
also used independently by some projects.

So far the license names PSF and PSFv2 found in LICENSE are mapped to
to Python-2.0. This patch maps PSF and PSFv2 to PSF-2.0 und thus
corrects the impression that Python-2.0 and PSF-2.0 are synonymous.

Mark Jonas (2):
  Add license text for PSF-2.0
  Map license names PSF and PSFv2 to PSF-2.0

 meta/conf/licenses.conf            |  6 ++--
 meta/files/common-licenses/PSF-2.0 | 49 ++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 2 deletions(-)
 create mode 100644 meta/files/common-licenses/PSF-2.0

--
2.25.1