2021-07-03 02:09:37

by Nishanth Menon

[permalink] [raw]
Subject: [PATCH] LICENSES/dual/CC-BY-4.0: Lets switch to utf-8

Lets drop the unicode characters that peeped in and replace with
equivalent utf-8 characters. This makes the CC-BY-4.0 file inline with
rest of license files.

This messes up code such as scripts/spdxcheck.py which assumed utf-8
LICENSE files.

Fixes: bc41a7f36469 ("LICENSES: Add the CC-BY-4.0 license")

Cc: Thorsten Leemhuis <[email protected]>
CC: Thomas Gleixner <[email protected]>
CC: Greg Kroah-Hartman <[email protected]>
CC: Christoph Hellwig <[email protected]>
Cc: Jonathan Corbet <[email protected]>

Reported-by: Rahul T R <[email protected]>
Signed-off-by: Nishanth Menon <[email protected]>
---
also see: https://lore.kernel.org/linux-spdx/[email protected]/T/#u

LICENSES/dual/CC-BY-4.0 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LICENSES/dual/CC-BY-4.0 b/LICENSES/dual/CC-BY-4.0
index 45a81b8e4669..869cad3d1643 100644
--- a/LICENSES/dual/CC-BY-4.0
+++ b/LICENSES/dual/CC-BY-4.0
@@ -392,7 +392,7 @@ Section 8 -- Interpretation.
Creative Commons is not a party to its public
licenses. Notwithstanding, Creative Commons may elect to apply one of
its public licenses to material it publishes and in those instances
-will be considered the “Licensor.” The text of the Creative Commons
+will be considered the "Licensor." The text of the Creative Commons
public licenses is dedicated to the public domain under the CC0 Public
Domain Dedication. Except for the limited purpose of indicating that
material is shared under a Creative Commons public license or as
--
2.32.0


2021-07-05 15:10:45

by Jonathan Corbet

[permalink] [raw]
Subject: Re: [PATCH] LICENSES/dual/CC-BY-4.0: Lets switch to utf-8

Nishanth Menon <[email protected]> writes:

> Lets drop the unicode characters that peeped in and replace with
> equivalent utf-8 characters. This makes the CC-BY-4.0 file inline with
> rest of license files.
>
> This messes up code such as scripts/spdxcheck.py which assumed utf-8
> LICENSE files.
>
> Fixes: bc41a7f36469 ("LICENSES: Add the CC-BY-4.0 license")

So...this file *is* in UTF-8; I'm finding your changelog a bit
confusing.

> Cc: Thorsten Leemhuis <[email protected]>
> CC: Thomas Gleixner <[email protected]>
> CC: Greg Kroah-Hartman <[email protected]>
> CC: Christoph Hellwig <[email protected]>
> Cc: Jonathan Corbet <[email protected]>
>
> Reported-by: Rahul T R <[email protected]>
> Signed-off-by: Nishanth Menon <[email protected]>
> ---
> also see: https://lore.kernel.org/linux-spdx/[email protected]/T/#u
>
> LICENSES/dual/CC-BY-4.0 | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/LICENSES/dual/CC-BY-4.0 b/LICENSES/dual/CC-BY-4.0
> index 45a81b8e4669..869cad3d1643 100644
> --- a/LICENSES/dual/CC-BY-4.0
> +++ b/LICENSES/dual/CC-BY-4.0
> @@ -392,7 +392,7 @@ Section 8 -- Interpretation.
> Creative Commons is not a party to its public
> licenses. Notwithstanding, Creative Commons may elect to apply one of
> its public licenses to material it publishes and in those instances
> -will be considered the “Licensor.” The text of the Creative Commons
> +will be considered the "Licensor." The text of the Creative Commons

It seems that what you're really doing is replacing "smart quotes" with
the basic ASCII variety? That seems like a fine thing to do, but that's
not really what the changelog says.

I can tweak it when I apply this.

Meanwhile, though, if there's a bug it's the spdxcheck.py issue reported
by Rahul. That problem doesn't reproduce here; he must be running in an
environment where ASCII is assumed. Being explicit about the encoding
expected is the right fix in any case... Maybe I'll snag that patch as
well if nobody else beats me to it.

Thanks,

jon

2021-07-06 07:36:51

by Thorsten Leemhuis

[permalink] [raw]
Subject: Re: [PATCH] LICENSES/dual/CC-BY-4.0: Lets switch to utf-8

On 05.07.21 17:08, Jonathan Corbet wrote:
> Nishanth Menon <[email protected]> writes:
>
>> Lets drop the unicode characters that peeped in and replace with
>> equivalent utf-8 characters. This makes the CC-BY-4.0 file inline with
>> rest of license files.
>>
>> This messes up code such as scripts/spdxcheck.py which assumed utf-8
>> LICENSE files.
>>
>> Fixes: bc41a7f36469 ("LICENSES: Add the CC-BY-4.0 license")
>
> So...this file *is* in UTF-8; I'm finding your changelog a bit
> confusing.

Ahh, I'm not the only one here.

>> Cc: Thorsten Leemhuis <[email protected]>
>> CC: Thomas Gleixner <[email protected]>
>> CC: Greg Kroah-Hartman <[email protected]>
>> CC: Christoph Hellwig <[email protected]>
>> Cc: Jonathan Corbet <[email protected]>
>>
>> Reported-by: Rahul T R <[email protected]>
>> Signed-off-by: Nishanth Menon <[email protected]>
>> ---
>> also see: https://lore.kernel.org/linux-spdx/[email protected]/T/#u
>>
>> LICENSES/dual/CC-BY-4.0 | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/LICENSES/dual/CC-BY-4.0 b/LICENSES/dual/CC-BY-4.0
>> index 45a81b8e4669..869cad3d1643 100644
>> --- a/LICENSES/dual/CC-BY-4.0
>> +++ b/LICENSES/dual/CC-BY-4.0
>> @@ -392,7 +392,7 @@ Section 8 -- Interpretation.
>> Creative Commons is not a party to its public
>> licenses. Notwithstanding, Creative Commons may elect to apply one of
>> its public licenses to material it publishes and in those instances
>> -will be considered the “Licensor.” The text of the Creative Commons
>> +will be considered the "Licensor." The text of the Creative Commons

FWIW, I kinda like that the text (apart from the intro) up to now is
identical to the official license text (where I copied it from iirc when
I added it), but well, the type of quotes really shouldn't matter, so:

Acked-by: Thorsten Leemhuis <[email protected]>

> It seems that what you're really doing is replacing "smart quotes" with
> the basic ASCII variety? That seems like a fine thing to do, but that's
> not really what the changelog says.

Thx for handling this, Jon.

> [...]

Ciao, Thorsten

2021-07-06 12:50:20

by Nishanth Menon

[permalink] [raw]
Subject: Re: [PATCH] LICENSES/dual/CC-BY-4.0: Lets switch to utf-8

On 09:08-20210705, Jonathan Corbet wrote:
> Nishanth Menon <[email protected]> writes:
>
> > Lets drop the unicode characters that peeped in and replace with
> > equivalent utf-8 characters. This makes the CC-BY-4.0 file inline with
> > rest of license files.
> >
> > This messes up code such as scripts/spdxcheck.py which assumed utf-8
> > LICENSE files.
> >
> > Fixes: bc41a7f36469 ("LICENSES: Add the CC-BY-4.0 license")
>
> So...this file *is* in UTF-8; I'm finding your changelog a bit
> confusing.

Arrgh, you are right.
>
> > Cc: Thorsten Leemhuis <[email protected]>
> > CC: Thomas Gleixner <[email protected]>
> > CC: Greg Kroah-Hartman <[email protected]>
> > CC: Christoph Hellwig <[email protected]>
> > Cc: Jonathan Corbet <[email protected]>
> >
> > Reported-by: Rahul T R <[email protected]>
> > Signed-off-by: Nishanth Menon <[email protected]>
> > ---
> > also see: https://lore.kernel.org/linux-spdx/[email protected]/T/#u
> >
> > LICENSES/dual/CC-BY-4.0 | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/LICENSES/dual/CC-BY-4.0 b/LICENSES/dual/CC-BY-4.0
> > index 45a81b8e4669..869cad3d1643 100644
> > --- a/LICENSES/dual/CC-BY-4.0
> > +++ b/LICENSES/dual/CC-BY-4.0
> > @@ -392,7 +392,7 @@ Section 8 -- Interpretation.
> > Creative Commons is not a party to its public
> > licenses. Notwithstanding, Creative Commons may elect to apply one of
> > its public licenses to material it publishes and in those instances
> > -will be considered the “Licensor.” The text of the Creative Commons
> > +will be considered the "Licensor." The text of the Creative Commons
>
> It seems that what you're really doing is replacing "smart quotes" with
> the basic ASCII variety? That seems like a fine thing to do, but that's
> not really what the changelog says.

Yes, that was the intent, the description and $subject came out all
wrong.
>
> I can tweak it when I apply this.

Thanks. Let me know if it turns out that I need to respin the patch.
>
> Meanwhile, though, if there's a bug it's the spdxcheck.py issue reported
> by Rahul. That problem doesn't reproduce here; he must be running in an
> environment where ASCII is assumed. Being explicit about the encoding
> expected is the right fix in any case... Maybe I'll snag that patch as
> well if nobody else beats me to it.

Thanks again.

--
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D

2021-07-07 09:06:00

by Thomas Gleixner

[permalink] [raw]
Subject: Re: [PATCH] LICENSES/dual/CC-BY-4.0: Lets switch to utf-8

Nishanth,

On Fri, Jul 02 2021 at 20:29, Nishanth Menon wrote:
> Lets drop the unicode characters that peeped in and replace with

Again: s/Lets//

> equivalent utf-8 characters. This makes the CC-BY-4.0 file inline with
> rest of license files.

> Creative Commons is not a party to its public
> licenses. Notwithstanding, Creative Commons may elect to apply one of
> its public licenses to material it publishes and in those instances
> -will be considered the “Licensor.” The text of the Creative Commons
> +will be considered the "Licensor." The text of the Creative Commons

In theory the License text should be a verbatim copy. But yes, this
unicode stuff is a pain.

Acked-by: Thomas Gleixner <[email protected]>

2021-07-07 17:30:36

by Pavel Machek

[permalink] [raw]
Subject: Re: [PATCH] LICENSES/dual/CC-BY-4.0: Lets switch to utf-8

On Wed 2021-07-07 11:04:45, Thomas Gleixner wrote:
> Nishanth,
>
> On Fri, Jul 02 2021 at 20:29, Nishanth Menon wrote:
> > Lets drop the unicode characters that peeped in and replace with
>
> Again: s/Lets//
>
> > equivalent utf-8 characters. This makes the CC-BY-4.0 file inline with
> > rest of license files.

s/utf-8/ASCII/? otherwise the description makes no sense...

> > its public licenses to material it publishes and in those instances
> > -will be considered the “Licensor.” The text of the Creative Commons
> > +will be considered the "Licensor." The text of the Creative Commons
>
> In theory the License text should be a verbatim copy. But yes, this
> unicode stuff is a pain.

But we use unicode elsewhere for random stuff, and license should
be verbatim, so I'm not sure this is good idea.

Pavel

--

2021-07-12 16:04:48

by Jonathan Corbet

[permalink] [raw]
Subject: Re: [PATCH] LICENSES/dual/CC-BY-4.0: Lets switch to utf-8

Nishanth Menon <[email protected]> writes:

> Lets drop the unicode characters that peeped in and replace with
> equivalent utf-8 characters. This makes the CC-BY-4.0 file inline with
> rest of license files.
>
> This messes up code such as scripts/spdxcheck.py which assumed utf-8
> LICENSE files.
>
> Fixes: bc41a7f36469 ("LICENSES: Add the CC-BY-4.0 license")
>
> Cc: Thorsten Leemhuis <[email protected]>
> CC: Thomas Gleixner <[email protected]>
> CC: Greg Kroah-Hartman <[email protected]>
> CC: Christoph Hellwig <[email protected]>
> Cc: Jonathan Corbet <[email protected]>
>
> Reported-by: Rahul T R <[email protected]>
> Signed-off-by: Nishanth Menon <[email protected]>
> ---
> also see: https://lore.kernel.org/linux-spdx/[email protected]/T/#u
>
> LICENSES/dual/CC-BY-4.0 | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/LICENSES/dual/CC-BY-4.0 b/LICENSES/dual/CC-BY-4.0
> index 45a81b8e4669..869cad3d1643 100644
> --- a/LICENSES/dual/CC-BY-4.0
> +++ b/LICENSES/dual/CC-BY-4.0
> @@ -392,7 +392,7 @@ Section 8 -- Interpretation.
> Creative Commons is not a party to its public
> licenses. Notwithstanding, Creative Commons may elect to apply one of
> its public licenses to material it publishes and in those instances
> -will be considered the “Licensor.” The text of the Creative Commons
> +will be considered the "Licensor." The text of the Creative Commons
> public licenses is dedicated to the public domain under the CC0 Public

...and I've applied this one as well.

Thanks,

jon